| commit | 9a73da916122d7ab1478f9b4e81c20c20445a853 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Aug 01 12:29:49 2017 -0700 |
| committer | Shuo Qian <shuoq@google.com> | Wed Aug 02 01:11:38 2017 +0000 |
| tree | 1717e4f4d5d0779d6885d43abcefc19208441432 | |
| parent | ba1ac6f7229b3f9054fc39b5d1a589383baf8dba [diff] | |
| parent | 140b84b377ecadc4631190a30015eb0ce7d9cf62 [diff] |
resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17 Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07