OSDN Git Service

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into oc...
authorHansong Zhang <hsz@google.com>
Fri, 13 Apr 2018 19:14:44 +0000 (12:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 19:14:44 +0000 (12:14 -0700)
am: 18ff936eed

Change-Id: I499b7a03f32a83ba11753ed0a1826d424c85667f


Trivial merge