| commit | eb20c5a9f4843083bd6af23fc933fcb92d7ce4fe | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 21:18:47 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 21:18:47 2017 +0000 |
| tree | 90be00464577528ee13e90f280e18c9b6ed84ef7 | |
| parent | 8f09557150c79676b20825d8625b182a3579cedd [diff] | |
| parent | 8876673b99c5095f7406c2c16a1e21f10bf4a371 [diff] |
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours" into oc-dev-plus-aosp