OSDN Git Service

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

Change-Id: I3b92bdd518ee6261cd2546031d5e944638a88c56


Trivial merge