OSDN Git Service

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

Change-Id: Ia25b02f0df97306066a4f52687ab55376b8bc3bb


Trivial merge