| commit | e48ca2099a79e3e27a237fc02294a2aa2e8e8305 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Aug 09 16:21:58 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 09 16:21:58 2017 +0000 |
| tree | 2f51b881e4498d9671da60ea2a63e5a0380e5306 | |
| parent | 6795c947ae660adf1ff314a0dad71fcea41d08cc [diff] | |
| parent | fa983ab25428c29fdde791249a347ae75cbc4e3c [diff] |
Merge "resolve merge conflicts of 15658662fdde to stage-aosp-master am: 3b38eaa3c2 am: 208a84ecb9" into oc-dr1-dev-plus-aosp