| commit | 6f693559690cd746def2f8c1f3fbbae8b87a5d01 | [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 | b33190fc560a0793749dcb895f7ccc8f285020c8 [diff] |
adb: correctly fix merge conflict. Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2