tree 8cd12f73d6a318b4004feb22b949b2e4c6a76213
parent 5574a0618d8c675e5c91d8e92a3589351378f2d4
parent 021a3899b30af98ba7d253b108a43a08205717a6
author Android Build Merger (Role) <android-build-merger@google.com> 1466095090 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466095091 +0000

Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 am: 092d961367" into nyc-mr1-dev-plus-aosp