| commit | fbdfc316178a4d46b383bd3fd3dd703d187d3a6b | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jul 05 21:28:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 05 21:28:03 2017 +0000 |
| tree | b76b72443d15d82d6d49aea5aafcf62fa69bb5ef | |
| parent | 165f684a63cb3d1d92ba829b2ecff82182f32ed2 [diff] | |
| parent | eb20c5a9f4843083bd6af23fc933fcb92d7ce4fe [diff] |
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours" into oc-dev-plus-aosp am: eb20c5a9f4 -s ours Change-Id: I65561262aaf4c3b4eb0c8efe495fb1f59968301b