| commit | 7d6b2ed5ca43975ee5aefea732116941a96f551c | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Nov 29 19:20:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 29 19:20:48 2016 +0000 |
| tree | 1773b7b49910001565110bda6af3261e1c7ac387 | |
| parent | 59b0a6fa5ca02de67777bf8c59470bd1afb67a13 [diff] | |
| parent | 4cf68bd5e444cbe3700c004f20b0be48184cc984 [diff] |
resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp am: 1e811fca22 am: 4cf68bd5e4 Change-Id: I93fd8d56164200e2a4f843f75a92cead92ec7bea