OSDN Git Service

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

Change-Id: I4b5e6cdc7e5b314b26c3eb26196c562ea852203a


Trivial merge