tree 8ff7858a67a601e0e163a5152e0d5996c1d06460
parent 0715f91223b2f7a91ea08bfa95998d846e7977cf
parent d1971c4cac37fccdccd105f78f7252582685ccd9
author Mike Lockwood <lockwood@android.com> 1285613214 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285613214 -0700

am d1971c4c: resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp

Merge commit 'd1971c4cac37fccdccd105f78f7252582685ccd9'

* commit 'd1971c4cac37fccdccd105f78f7252582685ccd9':
  Add AID_GPS user ID for GPS daemon