OSDN Git Service

[automerger skipped] Merge changes from topic "am-0faa2c83-9779-430a-b81c-34246f31544...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 09:14:31 +0000 (02:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 09:14:31 +0000 (02:14 -0700)
am: 67d1e89fc6  -s ours

Change-Id: Ia23f6c04a1d10ab49234b485518048b1d0767eec


Trivial merge