OSDN Git Service

[automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master
authorXin Li <delphij@google.com>
Tue, 9 Apr 2019 05:16:49 +0000 (22:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Apr 2019 05:16:49 +0000 (22:16 -0700)
am: f97b951645 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic383ec1408e324784845a002f2754bd17e83e22f


Trivial merge