OSDN Git Service

Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
authorEtan Cohen <etancohen@google.com>
Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)
am: 4839fb4abd

Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10


Trivial merge