OSDN Git Service

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into oc-dev
authorMyles Watson <mylesgw@google.com>
Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)
am: d1305de35a

Change-Id: I1ee0e824ef5fdf2e434a6505bc25ab026472151e


Trivial merge