OSDN Git Service

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

Change-Id: Ice0e0dee03141da42d0dfb673fa0277ae0858a7c


Trivial merge