OSDN Git Service

Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
authorEtan Cohen <etancohen@google.com>
Thu, 8 Feb 2018 07:09:02 +0000 (07:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Feb 2018 07:09:02 +0000 (07:09 +0000)
am: 8e5ec12799

Change-Id: I3eed03bdd6515f32bb419fee9a9f9af9367ab424


Trivial merge