| commit | cbc65a22e2e3077691158a7e6f35b1b0ac24d12a | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 21:40:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 21:40:15 2017 +0000 |
| tree | 7773c8f10457c6f6bb29f14ef0063b49beec9bff | |
| parent | b36add58d8f281883f3adae36ebe656a67774e48 [diff] | |
| parent | a0863c244422d579cf45db2d125f053699870c33 [diff] |
Merge "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 am: 11dc56bd83 -s ours"