| commit | d067dcdaa3af17a5950271dbe80c4ae9b2d694e2 | [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 | aef02526b593521678f6c671611571286214e3a4 [diff] | |
| parent | 1286c1f878ebbd8389745608ac57c75666822a4f [diff] |
adb: correctly fix merge conflict. am: 1286c1f878 Change-Id: I865cc05bef06ec33941766993e6aef2171be3e67