OSDN Git Service

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am...
authorXin Li <delphij@google.com>
Tue, 26 Feb 2019 01:19:35 +0000 (17:19 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Feb 2019 01:19:35 +0000 (17:19 -0800)
am: d453b1c2ce -s ours
am skip reason: subject contains skip directive

Change-Id: Iabdeddadc01518dfadffc300b0e458496e392fd9


Trivial merge