| commit | a4b22ba1240d392ffa542709fae7a4e3ebc43861 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Thu Jun 16 16:40:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 16:40:44 2016 +0000 |
| tree | 0180a5d9c08582f685c3ed053baf3ff8dc150101 | |
| parent | c38f457e7ad2b86b1f3be51e3824bd96cca912ce [diff] | |
| parent | b901e4c4e6df832c8d10f25e7b5aaecbc9c6fbea [diff] |
Merge \"Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: 092d961367\" into nyc-mr1-dev-plus-aosp am: b901e4c4e6 Change-Id: Id83cd214744a5114b518236bb7091d2578d47849