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 18:39:18 +0000 (11:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 18:39:18 +0000 (11:39 -0700)
am: c45fb1ea3a

Change-Id: Ica788159063524b5704aeac9a8d9694451fd63be


Trivial merge