OSDN Git Service

Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 31 May 2018 18:46:20 +0000 (11:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 18:46:20 +0000 (11:46 -0700)
commit5d0975d788ca75644b95ec455ca31d8abbb3ccfe
tree02f2f9fd7b7067ffb935951bedd1b7a56b335eac
parentb77d2d0e6f25cd2fcd7a46b9ac158d43baa3d1b4
parente0863fe41e920554d3459419ab95377d895bb544
Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into oc-dev
am: e0863fe41e

Change-Id: Ic32b25694f9683b391af088914aa0e1f9a39798a