| commit | 53e507b19098fd3405902e8f57cf2772de5d50b0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 19 04:30:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 04:30:08 2016 +0000 |
| tree | 36987e37810baf019fb626408061b3a61b249e52 | |
| parent | 79372d69d7a42c515b84710428102c4f6e040887 [diff] | |
| parent | a0a9e8996e401c7b4fd4cae34ca99fdb2f4cbe96 [diff] |
resolve merge conflicts of 847d963 to nyc-dev-plus-aosp am: 9110eaab41 * commit '9110eaab4116c7edb38045b21a01226eccd5eb0a': Change-Id: Idb0f7df71e6796e056532f3b1923fd98bb9a2c5e