| commit | 71aa48b5d627a9be4bbd5b9d3785714fb1e3e774 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jul 05 21:36:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 05 21:36:14 2017 +0000 |
| tree | 7773c8f10457c6f6bb29f14ef0063b49beec9bff | |
| parent | 64c9a30da1bed2ceed8c7ee8f1dec5bba65af6fa [diff] | |
| parent | dad1aa3e11f2089a44564760eb1c48aeea8e99e4 [diff] |
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours" into oc-dev-plus-aosp am: eb20c5a9f4 -s ours am: dad1aa3e11 -s ours Change-Id: I090f28ba571ccca414b9e574b7a5e7476d519e69