tree d4518b16f43ecbc22896e5467c012bab22a93781
parent 7b84e72cc4609e04afdd7cc9a337be99444f74a9
parent f72961d068d7a89403f0bb828f65021ac73a5cff
author Jean-Baptiste Queru <jbq@google.com> 1276126111 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276126111 -0700

am f72961d0: merge from froyo-plus-aosp