diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 17:53:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 17:53:45 -0700 |
| commit | 175884f3889ac674b64d2a08f2928ce7722696e3 (patch) | |
| tree | f3a32fa40a686b4764ae225410ba58d13437f414 /AndroidManifest.xml | |
| parent | 78391ae77f1c8bc8c1c0fb89f57c4fb5941e8f4b (diff) | |
| parent | d205bfe361c1de857e8013d6acd36f3f831eb979 (diff) | |
| download | packages_apps_settings-175884f3889ac674b64d2a08f2928ce7722696e3.zip packages_apps_settings-175884f3889ac674b64d2a08f2928ce7722696e3.tar.gz packages_apps_settings-175884f3889ac674b64d2a08f2928ce7722696e3.tar.bz2 | |
am d205bfe3: (-s ours) am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit 'd205bfe361c1de857e8013d6acd36f3f831eb979':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions