| commit | a748e8e17ef8609e266d14e4257ceded5c57a125 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Aug 15 19:02:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 19:02:38 2017 +0000 |
| tree | 73f3710868370ec815f51220caec0d4ca82abc8b | |
| parent | 3b543e3c2f82da2919aef4d82af963a06e7d1780 [diff] | |
| parent | 396aadae6f9514369aeda2263ca1e144bf78de10 [diff] |
resolve merge conflicts of 3ceaacc to stage-aosp-master am: 04b63e5ab2 am: 396aadae6f -s ours Change-Id: I89f137a2a1de1e66453e3cfd664cdfc717eb7887