| commit | 65c93572b38864dc6fb22ec45a2b8f5f6f112eff | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Mon Apr 17 13:54:57 2017 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Mon Apr 17 13:54:57 2017 -0700 |
| tree | 73c17fdd275bf6000983e5743b3099cd9ec148e0 | |
| parent | d1794e2d7b42a0392f91cb597de4cc59b647c712 [diff] | |
| parent | 1b886a1cb3a370505e56ac5479641832b8695154 [diff] |
resolve merge conflicts of 1b886a1 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I3f201477f022df447d95d08ec3b7f9540ef0f058