OSDN Git Service

Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 12 Jul 2018 23:31:02 +0000 (16:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jul 2018 23:31:02 +0000 (16:31 -0700)
commit953bd8df9b90a15d4cf98298d891fa5ccaee322e
treed962753c539ed3ab9cdf4a9e8a5d05124b781073
parent2291879cbf72e8bcd11e1b30fb8f772573123b11
parentc5830db06a148b53f9c0329580e645d93093fd7e
Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into oc-dev
am: c5830db06a

Change-Id: I9c42d24c941977bf803df7c1411622c1a921c7fa