OSDN Git Service

[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf6...
authorXin Li <delphij@google.com>
Fri, 10 May 2019 00:25:01 +0000 (17:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 00:25:01 +0000 (17:25 -0700)
am: f0acd850fb -s ours
am skip reason: subject contains skip directive

Change-Id: I6f942defbfadc4843ec881dd08feaf61db69d3d6


Trivial merge