OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205...
authorXin Li <delphij@google.com>
Wed, 12 Dec 2018 00:10:42 +0000 (16:10 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Dec 2018 00:10:42 +0000 (16:10 -0800)
am: 2c2f179630  -s ours

Change-Id: I1bba0ad51442e03281b6b668c6a16ced39cc62a8


Trivial merge