OSDN Git Service

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
authorBill Yi <byi@google.com>
Wed, 24 Oct 2018 23:29:44 +0000 (16:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Oct 2018 23:29:44 +0000 (16:29 -0700)
am: 8e228fc8be  -s ours

Change-Id: I9eff1ef267c5a5b776532524f8e629dc2b519b50


Trivial merge