OSDN Git Service

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev
authorBill Yi <byi@google.com>
Fri, 6 Jul 2018 04:11:19 +0000 (21:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 04:11:19 +0000 (21:11 -0700)
commitaf687adf49d5f935c46468972e5b43bdab60d855
tree1fdea631d5d584f1658a7b3eb17199824f76c9ea
parenta8276b8de4218dbfaa9f08f93be7ab8c60bf3ce0
parent72e16b1754a1c832bdf35abeb7abc36af7e02d95
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev
am: 72e16b1754

Change-Id: I75a0f507a546413eeee64870ba94be647ee5de11