tree ce4205a67d7d796a6b749fe0f7bfbb12370e6b80
parent 242c28f313f90bbd77354ced1b3d70e31691db4f
parent 158eae223d9fcc2d754f2314ec3b959dda2d91ac
author Myles Watson <mylesgw@google.com> 1512623270 +0000
committer android-build-merger <android-build-merger@google.com> 1512623270 +0000

Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444
am: 158eae223d

Change-Id: I4f703af6fbffde4287555db1eb2b03e857a50008