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 18:22:08 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Mar 2018 18:22:08 +0000 (18:22 +0000)
am: 77ac94b2ce

Change-Id: I8f22075b7d9138a8353bb52d604e6af454129fbd


Trivial merge