OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE"
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2018 01:57:25 +0000 (17:57 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Dec 2018 01:57:25 +0000 (17:57 -0800)
am: 13faf565ff  -s ours

Change-Id: I6a1e5432df10cca673f3c8cc0849c030ab40d291


Trivial merge