| commit | 2d0f12c43e269337165db6142dba6ddb66e13ca0 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 21:31:28 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 21:31:28 2017 +0000 |
| tree | b76b72443d15d82d6d49aea5aafcf62fa69bb5ef | |
| parent | 11dc56bd83d70a5149b653361c6af12d37a174e3 [diff] | |
| parent | 7649e0f0427043271063d29bd324fa2a0c09399b [diff] |
Merge "Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master am: a998cffb1b -s ours" into oc-dev-plus-aosp am: 530a622f60 -s ours" into oc-dr1-dev-plus-aosp