| commit | b88a71e60c904b0fe1b91e0b52ca99517c969a3b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Oct 24 20:37:02 2017 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Oct 24 20:37:06 2017 -0700 |
| tree | 8230ead623092607f64101bd477e8defb0e01397 | |
| parent | fd05e9a0750e9658989f49fbf51fd1fefbe466b3 [diff] | |
| parent | 1fae62661258e42af2d79c6cfb6c2b4820363854 [diff] |
resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I091e95c259029c7380f269a4258cc269458d2020