| commit | 8d3d0ce93a31c34f614bf2d170d56755586d49af | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Fri Nov 18 17:30:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 18 17:30:47 2016 +0000 |
| tree | 0704e3d453f1eca43f1ed14f0723967c839bd148 | |
| parent | d6658ac131148106c62fcc0d0567c7c53e64ef8c [diff] | |
| parent | cba59432ba25f1a2efccc1e878eae59a35ddc074 [diff] |
resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp am: cba59432ba -s ours Change-Id: I081ed5a1b6b85dea57a1a55a8e3f41b0ecaf974f