OSDN Git Service

[automerger skipped] Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666d...
authorAtanas Kirilov <akirilov@google.com>
Wed, 6 Jun 2018 00:39:01 +0000 (17:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 00:39:01 +0000 (17:39 -0700)
commit7e4faf89ec29afe6537b604bcb74620104b33917
treebf089eeb2e1bbd928f738bd9127730e56c5a4e4c
parentefa585d96af96c2bf17f2bd8190dc9b2f16958c0
parent94fbd36ef8de72e919ca91ebd8d86e84e79b3617
[automerger skipped] Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev am: c3b4881ea5 am: 4f74605d11
am: 94fbd36ef8  -s ours

Change-Id: I6ebb4b10741f702572574076cebe711605c01a2e