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:52:02 +0000 (15:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 22:52:02 +0000 (15:52 -0700)
am: 8ba28ebdfd

Change-Id: I6ca14b43fc72b65e510ec448a57aac65cfb263dd


Trivial merge