| commit | 5e65aa936effce6a15eb2fb7b3f88345064a6f7e | [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 | 7adf406c6e6d4052ffd67f710e7583ec792b3f44 [diff] | |
| parent | 4c2b1f4b3051c50d61fcdb6f7f0be9a2eeaea598 [diff] |
adb: correctly fix merge conflict. am: 1286c1f878 am: d067dcdaa3 Change-Id: Ib6a4f905e878b2681c44a5075647925b8d5f61e1