OSDN Git Service

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

Change-Id: I596c427de3b27a6b3f323117fbc037a0c000f417


Trivial merge