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:18:26 +0000 (16:18 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Feb 2019 00:18:26 +0000 (16:18 -0800)
am: 1994397e6a -s ours
am skip reason: subject contains skip directive

Change-Id: I5c40623742c23696457c1fedb742322c634ed1f6


Trivial merge