OSDN Git Service

Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: e084a08ff5
authorTodd Kennedy <toddke@google.com>
Thu, 16 Jun 2016 16:40:42 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 16:40:42 +0000 (16:40 +0000)
commitc38f457e7ad2b86b1f3be51e3824bd96cca912ce
tree0180a5d9c08582f685c3ed053baf3ff8dc150101
parentdcb6e7d584df0200e9752f90b6627ae6ea26f93a
parent5574a0618d8c675e5c91d8e92a3589351378f2d4
Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: e084a08ff5
am: 5574a0618d

Change-Id: I20c7f3dd9ed062a470227ae8c7c7e305cb65730e