OSDN Git Service

Merge changes from topic "am-de483eec-fa20-48e1-8e14-9d6660359644" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 12 Jul 2018 23:30:22 +0000 (16:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jul 2018 23:30:22 +0000 (16:30 -0700)
commit2291879cbf72e8bcd11e1b30fb8f772573123b11
treed962753c539ed3ab9cdf4a9e8a5d05124b781073
parent08374e2cc6151ef42b738e90220bd41c30ce07fe
parent91aa6dd9273ece9b73dce0db969969982030e9fe
Merge changes from topic "am-de483eec-fa20-48e1-8e14-9d6660359644" into oc-dev
am: 91aa6dd927

Change-Id: I34949e1ee58489ac2c690f023672a749bdcb2698