OSDN Git Service

Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Fri, 6 Apr 2018 22:47:28 +0000 (15:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 22:47:28 +0000 (15:47 -0700)
am: 3eaed2cf81

Change-Id: Ida9bffe6ee50911ff20f1a41d431205b30b34cf1


Trivial merge