| commit | 27e6c6d9e58c119d381c3d13b47af421881ddc3d | [log] [tgz] |
|---|---|---|
| author | Betty Zhou <bettyzhou@google.com> | Thu Feb 09 02:33:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 09 02:33:22 2017 +0000 |
| tree | c8cfa61dbad9b2eb8be85a1876df3695086e7b59 | |
| parent | f6e79c5083d8405e4f17aabd2172d9c60dc2d535 [diff] | |
| parent | 00f257c2a198133086a3be647b0b8a04afeb4424 [diff] |
resolve merge conflicts of 813fb93 to nyc-mr1-dev-plus-aosp am: 392f7c30f8 am: 00f257c2a1 Change-Id: I31b71b7d6cc148e26a38aa5647a2547972f72670