OSDN Git Service

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev
authorEtan Cohen <etancohen@google.com>
Thu, 8 Feb 2018 05:40:11 +0000 (05:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Feb 2018 05:40:11 +0000 (05:40 +0000)
am: 827eb741d7

Change-Id: Ic35c752cb5435d00eb91df8e296a433e859c3afc


Trivial merge