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 18:19:04 +0000 (11:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Oct 2018 18:19:04 +0000 (11:19 -0700)
am: 1a117e038c  -s ours

Change-Id: Ieffc6b0da23ba01df6f9a42272580226d7861b0b


Trivial merge