tree f54fc1503d5bbed3ebde1461f12c5d18f05b3366
parent 79be3b16fcf3d81d8f655bd3a5ff54ff931ee1bc
parent 61d67acde5e4da465915a278e8d9357bd9e16c52
author Chienyuan <chienyuanhuang@google.com> 1538596422 -0700
committer android-build-merger <android-build-merger@google.com> 1538596422 -0700

[automerger skipped] Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437 am: 6ac6aead0d
am: 61d67acde5  -s ours

Change-Id: Ib3a3feff813b6df565878474c29b0b97f9f28e62