| commit | 826b6094a76efdfa747f477285bc7083bc80c73f | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Aug 29 11:30:52 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Tue Aug 29 11:30:52 2017 -0400 |
| tree | 50d82c31fff22dd5c3437621d370cfaf038fba3f | |
| parent | a59380177dbfa53614cff1c101f66a21fc9dc9f3 [diff] | |
| parent | 1a5e87918ebe4419653f3cb93c533af292b20bb7 [diff] |
resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f