tree f05c2c8255d65cb119e7d62d280001396b096456
parent 16398c9c973ba16a14455c4eee9ca162e0273792
parent a17a5b814f1c578df28cd5d444bd8abc3adbbba0
author Jeff Brown <jeffbrown@google.com> 1348615499 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348615499 -0700

Merge "Fix regression in Bluetooth settings." into jb-mr1-dev