OSDN Git Service

Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev
authorHansong Zhang <hsz@google.com>
Fri, 10 Aug 2018 00:51:46 +0000 (17:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Aug 2018 00:51:46 +0000 (17:51 -0700)
commit23996390b54b7ee4b512319eb473cdb209911d55
tree6c803c833c9ff0edd79a99a77a72b3d68a55f1d7
parent597d46d81d4360df1d58e1ffcc1fa9609b7ab842
parentb01b82b03acc679257211b7f290b9c31f1f9c643
Merge changes from topic "am-49bd153a-ceb2-41b6-8588-4e6a6475d94a" into oc-dev
am: b01b82b03a

Change-Id: I42f2e51fbff12afc07f01690bc9f18b99b84eda9