| commit | 595ff996dda313b4fa0b0c6549c1a816372b9163 | [log] [tgz] |
|---|---|---|
| author | Chen Xu <fionaxu@google.com> | Thu Jun 22 19:23:19 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 22 19:23:31 2017 +0000 |
| tree | 2f3a396e3dcec7e2c3e33fbf155bbcfabc810bcd | |
| parent | a31688b8cbff2a212b6d4620872dbbc0cde3fd69 [diff] | |
| parent | 35276a6696fb25adb613411b0f5b5d4b6869ab05 [diff] |
Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp