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 05:28:53 +0000 (21:28 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Feb 2019 05:28:53 +0000 (21:28 -0800)
am: 0143f90169 -s ours
am skip reason: subject contains skip directive

Change-Id: I680fe1e275d0f0054e624fb0d31d2ef84b4a2162


Trivial merge