| commit | cd629590f2672d4b22915ffb5fcde533eae0b11f | [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 | d2f15f872da5d16f9c2284677b4c7e1650ba643f [diff] | |
| parent | aef042cfee42bdd0d209f96b6f2b665d8d3671a8 [diff] |
resolve merge conflicts of 863442b to nyc-mr2-dev-plus-aosp am: aef042cfee Change-Id: I06e1cf13fb0f46cc6cd509a336aef1bce7f5f960