OSDN Git Service

[automerger skipped] Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote...
authorAtanas Kirilov <akirilov@google.com>
Fri, 1 Jun 2018 02:15:01 +0000 (19:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 02:15:01 +0000 (19:15 -0700)
am: f81208cc6d  -s ours

Change-Id: I1bb10072a0ed468006f83603643a6b2dbf93f924


Trivial merge