| commit | 85c316b52daee573ac61aefdc306f2105f40933f | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Aug 29 18:12:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 29 18:12:28 2017 +0000 |
| tree | 1a56e1a6d3028b56fc94d1c3a67c5d773dd594a7 | |
| parent | 07de44c3c79d2b5476d0615010015e6e7d079973 [diff] | |
| parent | 57c1f708ba00ea976ca2d309202f6b4f6e21cf3b [diff] |
Merge "resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: 57c1f708ba Change-Id: Ibd1a6dc565501d2e52350f44d19689100d1c7fdf