| commit | 3640120a3ec645e5273f506905e100cef04a8771 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 06 13:19:41 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Mon Nov 06 13:19:41 2017 -0800 |
| tree | 56b062681ef8fe1b2e820ff8ea87a0fa28e2e9d9 | |
| parent | 15551d4618a06f202deb7f3bb8dd72dc6614e15a [diff] | |
| parent | e17c94c7b4157884cb6caf4393c2299241851baf [diff] |
resolve merge conflicts of e17c94c to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Iaacf9d494af871b24d6348a460065104a8a43f3e