OSDN Git Service

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am...
authorBill Yi <byi@google.com>
Mon, 11 Jun 2018 21:01:09 +0000 (14:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jun 2018 21:01:09 +0000 (14:01 -0700)
commit689cf0f8a2e3d3cfa83a7dc1db6c6432f1785aae
tree32324c9c9d10e5e336d87443cee6f87b8e127e02
parentb10ebef583d348d799840b0087bb83f4ec9f0b87
parent24701167ba646595529cc82135502b3e63af9415
Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93
am: 24701167ba

Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7