OSDN Git Service

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Fri, 13 Apr 2018 18:32:42 +0000 (11:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 18:32:42 +0000 (11:32 -0700)
commit3e2c5ef3d44b8bc260fef511b845e6532d31a0bc
tree4bfe21022f963cca0f9fa765e1ae645babfd5a36
parent79a34c4d18462ac2b97b491d0ad82866f459696d
parente6057078f754c21ed9fe4ea88ab232ea8313d1d3
Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9" into oc-dev am: 853d6267e1
am: e6057078f7

Change-Id: I65f3977ee433e1d6709144d7d8b3091804135c3c