OSDN Git Service

Merge changes from topic "am-849ff548-1de9-4e50-a013-4d02bb85a1d2" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 12 Jul 2018 23:29:34 +0000 (16:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jul 2018 23:29:34 +0000 (16:29 -0700)
commit08374e2cc6151ef42b738e90220bd41c30ce07fe
treed962753c539ed3ab9cdf4a9e8a5d05124b781073
parent539f871a6a4e6c41684e6ab57e6e764d2086925d
parent15b3c81008348ac46c5fc3796f85f30935f0379d
Merge changes from topic "am-849ff548-1de9-4e50-a013-4d02bb85a1d2" into oc-dev
am: 15b3c81008

Change-Id: I692f9c4d27a6f3d2594828b96928e3f50bb1d111