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 04:54:36 +0000 (20:54 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Feb 2019 04:54:36 +0000 (20:54 -0800)
am: e2d223e756 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia15f70a5bd939d062118e5c3dc85f0df41d40c36


Trivial merge