OSDN Git Service

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)
commit1ebe18d6918cba9774698ebada7c29a499c5ece6
tree21a4c8b3859dbb15ea2bfcabcd3ac523993896f5
parent0537f1651630ed14f9974c6b62e4497260f9e194
parent6fd06712657d00fda4c0fb5ee325b17b14415b02
Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am: 6fd0671265  -s ours

Change-Id: Ib9428106e209a77220e22f43210ecf0d946128ad