| commit | 746c82e7c645401fa90d1e36d9b0f67e05d7b34a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Oct 25 05:37:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 25 05:37:12 2017 +0000 |
| tree | c5d985327b46fb4ae4e88b4f3f7f53e3bf91d4a4 | |
| parent | 8b3152c37a73ee0fca6292f74954204366d73dfe [diff] | |
| parent | c4ca931dc558ef860f9c3a914d4ec4b933847e02 [diff] |
Merge "resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: c4ca931dc5 Change-Id: I6c42eb5cb874dc359cc8b9c3e01244182197faf3