OSDN Git Service

Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Sat, 2 Feb 2019 08:17:27 +0000 (00:17 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Feb 2019 08:17:27 +0000 (00:17 -0800)
am: 812588ad71

Change-Id: Iee2d82f39de0c5bf5eb5eb846d88ca87feb12c95


Trivial merge