diff options
| author | Michael Chan <mchan@android.com> | 2010-01-11 15:19:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 15:19:50 -0800 |
| commit | 8edfd3a76be936b255484dc20bbeba0050e66e75 (patch) | |
| tree | 00b6861ebd338ce09fe35f50248584488183a07a /res/xml/security_settings.xml | |
| parent | 89a363ebbc804c28356bc714061ba38142f23c68 (diff) | |
| parent | 79270566b178ed7efc1c62f8410822d46d6e3152 (diff) | |
| download | packages_apps_settings-8edfd3a76be936b255484dc20bbeba0050e66e75.zip packages_apps_settings-8edfd3a76be936b255484dc20bbeba0050e66e75.tar.gz packages_apps_settings-8edfd3a76be936b255484dc20bbeba0050e66e75.tar.bz2 | |
am 79270566: (-s ours) am d9d8ef26: Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair
Merge commit '79270566b178ed7efc1c62f8410822d46d6e3152'
* commit '79270566b178ed7efc1c62f8410822d46d6e3152':
b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Diffstat (limited to 'res/xml/security_settings.xml')
0 files changed, 0 insertions, 0 deletions