OSDN Git Service

Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into oc-dev
authorAjay Panicker <apanicke@google.com>
Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)
am: 142e752125

Change-Id: I097d61047d05db7daf8d4142f0a57fa8536fa806


Trivial merge