commit | 7570ab61d40190a1e9c5d4cd9dfc8220dbb18235 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 09 16:28:31 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 09 16:28:31 2010 -0700 |
tree | d4518b16f43ecbc22896e5467c012bab22a93781 | |
parent | 7b84e72cc4609e04afdd7cc9a337be99444f74a9 [diff] | |
parent | f72961d068d7a89403f0bb828f65021ac73a5cff [diff] |
am f72961d0: merge from froyo-plus-aosp