OSDN Git Service

[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633...
authorAtanas Kirilov <akirilov@google.com>
Thu, 28 Jun 2018 01:10:46 +0000 (18:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jun 2018 01:10:46 +0000 (18:10 -0700)
am: 1028b26d46  -s ours

Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898


Trivial merge