OSDN Git Service

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev am...
authorRubin Xu <rubinxu@google.com>
Fri, 9 Mar 2018 15:55:09 +0000 (15:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Mar 2018 15:55:09 +0000 (15:55 +0000)
am: f45dbc6a69

Change-Id: Ic7d8a8dd5cff126f9995ba9aa3e1158d724e4403


Trivial merge