| commit | 2cc87be3e81c6e0b2a6660078949dcdb7935a4d6 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Tue Nov 01 18:45:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 01 18:45:40 2016 +0000 |
| tree | 344b243359aa22856db442bf6945dbd7ce791017 | |
| parent | 62da3340efcd2db3d4cb0899b8cd1ba94601d3eb [diff] | |
| parent | 36880fc711e004269266fae936ced1f970419cd4 [diff] |
resolve merge conflicts of 863442b to nyc-mr2-dev-plus-aosp am: aef042cfee Change-Id: I06e1cf13fb0f46cc6cd509a336aef1bce7f5f960