| commit | ca41e8f116ea051b23bc05ab4c3452783530e405 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Sep 01 17:13:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 01 17:13:37 2017 +0000 |
| tree | 96946133745968edb8e9980107d1a87514f1bd98 | |
| parent | 9eb7a69e785b490be00d87ffccd4c861507fca50 [diff] | |
| parent | 6dadd3e441ee6791e208491153b471d235335ea1 [diff] |
resolve merge conflicts of e30e3430f936 to oc-mr1-dev-plus-aosp am: 6dadd3e441 Change-Id: I591148bc1565abffa458f7b968d5bf5abe5019ea