tree f06696bad77adfec53b2c3bb35aa7c76ab687ab3
parent 5736b1689ae1240aeda8871203366083478bc7fc
parent e81838f7e1dd1391d3a84e34317e5f8fcf257c48
author Andre Eisenbach <eisenbach@google.com> 1484239695 +0000
committer android-build-merger <android-build-merger@google.com> 1484239695 +0000

Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7
am: e81838f7e1

Change-Id: I62d424e92e10c1604938349e94ae38938557130c