OSDN Git Service

[automerger skipped] Merge changes from topic "am-687d0d76-1eea-4aa7-85c2-727a2127c13...
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 10:33:24 +0000 (03:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 10:33:24 +0000 (03:33 -0700)
commitd82b5627f26e9c1b267149e460a607f410d56707
tree18ef5ecb0db47ad3dee5c82ca715c2c9f2466b52
parent258d293e4372a0ed357a50b5bebcacbe8a61cffb
parent2f2259ce16685fe0ce593b4b5ff1db162451cdc0
[automerger skipped] Merge changes from topic "am-687d0d76-1eea-4aa7-85c2-727a2127c13f" into oc-dev am: 2008b8b0f1  -s ours
am: 2f2259ce16  -s ours

Change-Id: Id5a567c7296bbefcf29d1a65b19548e53bd4c1bf