| commit | 6458efbbb6b8c8984ac9fa19eb46704543c92e4e | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Fri Jul 21 19:39:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 19:39:33 2017 +0000 |
| tree | 61985030cbb3d27f378d9a10024b889194730207 | |
| parent | 28a789d56409ea70ed707f7dd01f857c0bf611c4 [diff] | |
| parent | 90477041422a2daf252d296f97a9e1241331557b [diff] |
resolve merge conflicts of 559caf25 to oc-dr1-dev-plus-aosp am: 4527721e85 am: 9047704142 Change-Id: I009e858e2343244bfd3672ac0ee0ff9399e0f354