OSDN Git Service

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001)...
authorXin Li <delphij@google.com>
Tue, 11 Dec 2018 23:09:05 +0000 (15:09 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Dec 2018 23:09:05 +0000 (15:09 -0800)
am: 79a563ab36  -s ours

Change-Id: I2a2a30bf46dbee8548e7196b98d7fad714f1b3b6


Trivial merge