| commit | ec7781238827e94d68b04bd74b4f67492ccbc25e | [log] [tgz] |
|---|---|---|
| author | Tucker Sylvestro <tuckeris@google.com> | Thu Oct 06 19:30:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 19:30:58 2016 +0000 |
| tree | 8741ffbd6096a432e8bd69b4ea4506a173b16d8b | |
| parent | 52ac845ed91ba83dd445077e3ccecefa2c3ef695 [diff] | |
| parent | 9c28dd5f2797510c3da719144247e867c58c6e18 [diff] |
resolve merge conflicts of 0ab28b7 to nyc-mr1-dev-plus-aosp am: 9c28dd5f27 Change-Id: Ic86923bd26889d9333384065fb5b91ca4ab544f1