OSDN Git Service

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

Change-Id: I3383043ac922082ac347e272e06e8872a4b3b9be


Trivial merge