tree 21a4c8b3859dbb15ea2bfcabcd3ac523993896f5
parent 0537f1651630ed14f9974c6b62e4497260f9e194
parent 6fd06712657d00fda4c0fb5ee325b17b14415b02
author Adam Lesinski <adamlesinski@google.com> 1499289142 +0000
committer android-build-merger <android-build-merger@google.com> 1499289142 +0000

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am: 6fd0671265  -s ours

Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc