OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE"
authorXin Li <delphij@google.com>
Mon, 10 Dec 2018 17:51:00 +0000 (09:51 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Dec 2018 17:51:00 +0000 (09:51 -0800)
am: c5db7f8f22  -s ours

Change-Id: I0684ed2a838e3c68d2e4ec48707b09a400f0e642


Trivial merge