OSDN Git Service

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

Change-Id: I5dc1cb04bd75ea5c465ff1671c0ea0372f42ed4b


Trivial merge