OSDN Git Service

Merge changes I00124a28,Id3a4e755
authorAndreas Gampe <agampe@google.com>
Tue, 12 Jun 2018 21:54:03 +0000 (14:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jun 2018 21:54:03 +0000 (14:54 -0700)
am: 5ab0032702

Change-Id: Idb7e486122cc464fa60e1563720896aaa18b5ace


Trivial merge