| commit | 57f58037b4c25471fae8fb4fb01bb6ce34e9f2dc | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Jun 15 19:49:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 15 19:49:52 2017 +0000 |
| tree | bd0fe52e0fb4d69cfac7c4460efa6e8ad240522a | |
| parent | a76b4e358ae1e403e38cbee6be5e7e4f3c3ccf84 [diff] | |
| parent | 797fdc445024f402a5b82860c1044906fc0d0cbf [diff] |
Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 797fdc4450 Change-Id: I71bf3a951130edc7af2c7e0f24b2acb078d76a83