OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205...
authorXin Li <delphij@google.com>
Thu, 13 Dec 2018 21:27:59 +0000 (13:27 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Dec 2018 21:27:59 +0000 (13:27 -0800)
am: cb7dcad70d  -s ours

Change-Id: I3937cd25882e43468acb0d0192a5ccd34aa59091


Trivial merge