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)
commit67d1e89fc62dc4095545f603b9fee1eb378631ee
treeb24e06e3a8029819fedbd0979267f9bde82a78f2
parent3756c5aa7e3a53c78bb95c9d636bf6a040a6a010
parent128001f32c450dc243888b5be2bc73c9756dbd1f
[automerger skipped] Merge changes from topic "am-0faa2c83-9779-430a-b81c-34246f31544a" into oc-dev
am: 128001f32c  -s ours

Change-Id: Ife565af8784c81d713186375b4eae708a42298e7