commit 945ff2024357bd4367cb437d3ebb32d6fb7e9438
author Eric Fischer <enf@google.com> Tue Oct 13 12:04:49 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 12:04:49 2009 -0700
tree 653ef7121e91eb96ad983781ef91e58dc47f173f
parent 74ae80b623d72d7fab1999fb9ce4b759419f4553
parent 94f3a36326ddecaa09787d795451b0a229fe111c

am 94f3a363: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'

* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
  Remove STOPSHIP BT logging.
  BT API security audit: fix a couple of permission mistakes.
  Fix issue #2175693: Add vmallocinfo to dumpstate
  add a way to easily catch and log GL errors (compile time flag)
  GPS: Fix problem with SUPL when SUPL APN is already active.
  Import revised translations.  DO NOT MERGE
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
  Import revised translations.  DO NOT MERGE