| commit | 74cf204ab947e0c27ede29dd8735fef3d06df2f6 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jul 05 21:39:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 05 21:39:27 2017 +0000 |
| tree | 7773c8f10457c6f6bb29f14ef0063b49beec9bff | |
| parent | 6e0f9306368df27ae0124fb5fc6b7cda83e5b080 [diff] | |
| parent | 11dc56bd83d70a5149b653361c6af12d37a174e3 [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 am: 11dc56bd83 -s ours Change-Id: I27945b9aa22e51b48894b0300542e5da4c95a048