OSDN Git Service

[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
authorBill Yi <byi@google.com>
Wed, 24 Oct 2018 17:57:23 +0000 (10:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Oct 2018 17:57:23 +0000 (10:57 -0700)
am: c3ab198dda  -s ours

Change-Id: Ice146f5b25f1505cfa6ff0fac42fc58f3aececac


Trivial merge