| commit | 11dc56bd83d70a5149b653361c6af12d37a174e3 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 21:30:03 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 21:30:03 2017 +0000 |
| tree | b76b72443d15d82d6d49aea5aafcf62fa69bb5ef | |
| parent | 9f27717e72a1c0733e9a35f93c1105da025de24b [diff] | |
| parent | fbdfc316178a4d46b383bd3fd3dd703d187d3a6b [diff] |
Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours" into oc-dev-plus-aosp am: eb20c5a9f4 -s ours" into oc-dr1-dev-plus-aosp