summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-05-28 21:37:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 21:37:59 -0700
commita1f49d8bb77db20617f9ea372ad9f1a9e06deece (patch)
tree962f0cde2af73572cd99717a65b5d76466798b50 /core/java/android/bluetooth
parent466ceb463f44f72bdd73764e50dcb34c174a0cfe (diff)
parent295eddb92fd6e137ae352ea8dace2ecd18bf0a8a (diff)
downloadframeworks_base-a1f49d8bb77db20617f9ea372ad9f1a9e06deece.zip
frameworks_base-a1f49d8bb77db20617f9ea372ad9f1a9e06deece.tar.gz
frameworks_base-a1f49d8bb77db20617f9ea372ad9f1a9e06deece.tar.bz2
am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit '295eddb92fd6e137ae352ea8dace2ecd18bf0a8a': Don't show emergency calls label unless it's a phone.
Diffstat (limited to 'core/java/android/bluetooth')
0 files changed, 0 insertions, 0 deletions