OSDN Git Service

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev
authorMyles Watson <mylesgw@google.com>
Fri, 2 Nov 2018 22:59:31 +0000 (15:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Nov 2018 22:59:31 +0000 (15:59 -0700)
commita9291d7c8b9d2d57d5b3854f194e44bb34a00773
tree795bb7661867cbeeaea730cc8fae435a96646d78
parentd23783330e82301af3b12885c0f1581b665fcc8f
parent6d6c82d9e0194382716e70200b030a17e599814f
Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev
am: 6d6c82d9e0

Change-Id: I4b9f9f0d282b966b123a36d2bf22a95f5ad89577