| commit | cd62a8f41adaaffb7175e008a1099caab916a322 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 16:05:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 16:05:50 2016 +0000 |
| tree | 02eb1cc3d2a5334af5c2b70fcefef468f5108a5c | |
| parent | 23a5b3921d7889e7b6b74d100c73ab8acfa2a1a3 [diff] | |
| parent | 52dd7ae138f1dcf38fa87799508635ce83f2b275 [diff] |
adb: correctly fix merge conflict. am: 1286c1f878 am: d067dcdaa3 am: 52dd7ae138 Change-Id: I189c5f2caf7e5fbe278c641720daca2e80084477