OSDN Git Service

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev
authorHansong Zhang <hsz@google.com>
Mon, 9 Apr 2018 20:48:15 +0000 (13:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 20:48:15 +0000 (13:48 -0700)
commitf82d65ad362d61c3cff0798a4aa82122de576cb1
treeb6aded9a9eb73bace850e9ed398774a3461f8bfd
parent5898801986018d5485b0c7fd79e4bc923b391519
parentb1a0889f7664040e9399d8019ef161e3c2c3a425
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev
am: b1a0889f76

Change-Id: Icc21ee9eebce0056dc6885f23874aee889f2cede