| commit | 52dd7ae138f1dcf38fa87799508635ce83f2b275 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 16:03:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 16:03:21 2016 +0000 |
| tree | 4861f14fb4db3f25397ada4d3479bd90424b2914 | |
| parent | c59b46d0c4fb8fbea4ed461709efdceaa4d27375 [diff] | |
| parent | d067dcdaa3af17a5950271dbe80c4ae9b2d694e2 [diff] |
adb: correctly fix merge conflict. am: 1286c1f878 am: d067dcdaa3 Change-Id: Ib6a4f905e878b2681c44a5075647925b8d5f61e1