| commit | 117e6cb16a49dd59dd8dbca42e029c0052f445ec | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Tue Jun 27 08:11:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 27 08:11:43 2017 +0000 |
| tree | 40bce018671126f24ca0051161f0952f55ad175d | |
| parent | 91cd168bfe2abd100e94d7894b30b3d326394f7f [diff] | |
| parent | cbfbd85c8e6fa426fef0ed943f117c47babc8dfa [diff] |
Merge "resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: cbfbd85c8e Change-Id: I54192e31782629a629231d0ef6f0a49788e9f6e7