commit | 75f5e39f40df211ca63dc7eb4c72844fefc1dfa7 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 09 15:58:46 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 09 15:58:46 2010 -0700 |
tree | c5e1565f06f22b8800b442e15f5d7b6f55dc7509 | |
parent | 76478e8ce6283b045c3759fc868773b0e699af30 [diff] | |
parent | 8ce07fabb60b557541872dcfcaf64241751be915 [diff] |
am 8ce07fab: merge from froyo-plus-aosp