tree f7b81f29c960af2f1f9ab78e031b8fe6e437718d
parent 9c99f3257c51c6d02aab9e9f1c18030ee6b15146
parent 0ab501b9821be7c82fb0c2b28695c9ef7cb76c7f
author Bryce Lee <brycelee@google.com> 1506708318 +0000
committer android-build-merger <android-build-merger@google.com> 1506708318 +0000

Merge "Reduce synchronized lock scope." into oc-mr1-dev am: 9b6ef6a8f6
am: 0ab501b982

Change-Id: I4cfd66ba2f1748751c5355466bedb36d5d369bba