OSDN Git Service

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

Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc


Trivial merge