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:10:28 +0000 (02:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 09:10:28 +0000 (02:10 -0700)
am: 128001f32c  -s ours

Change-Id: Ife565af8784c81d713186375b4eae708a42298e7


Trivial merge