diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 17:23:58 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 17:23:58 -0800 |
commit | 0b13debc0aaca69bbef781da47a2ca5c0e6d9af7 (patch) | |
tree | 9eef1b57d2816c6debe687ed25f935c931b68964 /res/values-bg/strings.xml | |
parent | e1fd97242bcac3c546c35a2576df3fafee04d25a (diff) | |
parent | e7f887dab2591a46ecf80616e00f33bb5d847935 (diff) | |
download | android_packages_apps_Bluetooth-0b13debc0aaca69bbef781da47a2ca5c0e6d9af7.tar.gz android_packages_apps_Bluetooth-0b13debc0aaca69bbef781da47a2ca5c0e6d9af7.tar.bz2 android_packages_apps_Bluetooth-0b13debc0aaca69bbef781da47a2ca5c0e6d9af7.zip |
am e7f887da: resolved conflicts for merge of 55936599 to stage-korg-master
* commit 'e7f887dab2591a46ecf80616e00f33bb5d847935':
code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package.
Diffstat (limited to 'res/values-bg/strings.xml')
0 files changed, 0 insertions, 0 deletions