tree 539d89ca8a1c9b515416402633c4f1e04738c7b9
parent e9265b771d72332d6021adc3a1333190ce5d103c
parent 879ff09c2ae5d09034a05178b00612caa3bfcc10
author Mike Lockwood <lockwood@android.com> 1299005929 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299005929 -0800

am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread

* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
  Give system server permission to access USB. DO NOT MERGE