| commit | 0e59b1b5b59e8103d051a0e0fa29b31521ad6a77 | [log] [tgz] |
|---|---|---|
| author | Ben Fennema <fennema@google.com> | Tue Oct 17 21:11:54 2017 -0700 |
| committer | Ben Fennema <fennema@google.com> | Tue Oct 17 21:11:54 2017 -0700 |
| tree | de660ba158a701b539af0d9510fee8f23e8bcd15 | |
| parent | d63273ba6dd2c708b00fe1df3f1886977d4b8ea5 [diff] | |
| parent | 8bf15bdda293cbd99c5e1fb3965260c6ea7026d5 [diff] |
resolve merge conflicts of 8bf15bdd to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I283023226bc6e4053b77a34044cdccdae75ad17b