diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 14:04:34 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 14:04:34 -0800 |
| commit | e7f887dab2591a46ecf80616e00f33bb5d847935 (patch) | |
| tree | 9b83ab9264fd0c960eba8ca69a6a25881e92885e /res/values-ru/strings.xml | |
| parent | 22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8 (diff) | |
| parent | 55936599e88a156fb132a68c2e93d77fdd4e8a2e (diff) | |
| download | android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.tar.gz android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.tar.bz2 android_packages_apps_Bluetooth-e7f887dab2591a46ecf80616e00f33bb5d847935.zip | |
resolved conflicts for merge of 55936599 to stage-korg-master
Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
Diffstat (limited to 'res/values-ru/strings.xml')
0 files changed, 0 insertions, 0 deletions