Commits
Mike Lockwood authored and Android Git Automerger committed 8697f397e29M
am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread * commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac': Give system server permission to access USB. DO NOT MERGE
Showing diff to2d5ed07940b