OSDN Git Service

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev am...
authorMyles Watson <mylesgw@google.com>
Fri, 2 Nov 2018 23:09:36 +0000 (16:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Nov 2018 23:09:36 +0000 (16:09 -0700)
am: cdbadeb96d

Change-Id: I9b85c90cf6a82fe97dbbf0a81c03249b4dc0e672


Trivial merge