| commit | 4c2b1f4b3051c50d61fcdb6f7f0be9a2eeaea598 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 16:00:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 16:00:50 2016 +0000 |
| tree | d21b7bcbd1865e7c0d5f5c61760f2001d6408abc | |
| parent | 89df4b62475d555e9dbf6723a13ac7cbd184783d [diff] | |
| parent | 6f693559690cd746def2f8c1f3fbbae8b87a5d01 [diff] |
adb: correctly fix merge conflict. am: 1286c1f878 Change-Id: I865cc05bef06ec33941766993e6aef2171be3e67