OSDN Git Service

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into oc-dev am...
authorMyles Watson <mylesgw@google.com>
Fri, 1 Jun 2018 00:08:36 +0000 (17:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 00:08:36 +0000 (17:08 -0700)
am: 6d40208ab2

Change-Id: I7effb72d31fa281e177fcbf56aa6724fbecda02e


Trivial merge