tree 5bfdb16d111ab15cba3fd4466579b17f6a7d2e68
parent a94d954862fab26f6159ed7bb836ba6758a569fd
parent 6ebedf0053ccefd414e5887db316f84bd8f6c44c
author Jean-Baptiste Queru <jbq@google.com> 1307478206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307478206 -0700

am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':