tree 7707a0e0aee2c4d404758e74b7661992497105be
parent 43d53395dcc1a2a84e2e2b548454aa6d8a3cb4a7
parent 345362c66fe1fdd71ad99e30553f6a03385a90a0
author Lenka Trochtova <ltrochtova@google.com> 1484146758 +0000
committer android-build-merger <android-build-merger@google.com> 1484146758 +0000

Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
am: 345362c66f

Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6