| commit | 1286c1f878ebbd8389745608ac57c75666822a4f | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 00:39:16 2016 -0700 |
| committer | Josh Gao <jmgao@google.com> | Fri Aug 05 00:39:16 2016 -0700 |
| tree | f2c12dd304c95f1b3696658c4e91e21b3506f920 | |
| parent | 4ff7f9f62ae5d283fb62ee87c615a801642cba8f [diff] |
adb: correctly fix merge conflict. Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2