diff options
| author | Daniel Sandler <dsandler@google.com> | 2009-08-31 16:41:57 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2009-08-31 16:41:57 -0400 |
| commit | 3cdbc2dfc1b4bc817cb1f2db724e308629955a7c (patch) | |
| tree | 2b45758c21ce4565ad04222b78e264e18a0fd5a4 /src/com/android/settings/bluetooth | |
| parent | 9d81a6fca29b49ce36bdb956d01dbf20f7cf42e1 (diff) | |
| parent | 2b9fd2d739085a297ec81ae73eebd60fed4c6896 (diff) | |
| download | packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.zip packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.tar.gz packages_apps_Settings-3cdbc2dfc1b4bc817cb1f2db724e308629955a7c.tar.bz2 | |
resolved conflicts for merge of 2b9fd2d7 to master
Diffstat (limited to 'src/com/android/settings/bluetooth')
0 files changed, 0 insertions, 0 deletions