commit | 8e9d20b3c4c78cf04db9d1bef8a1438f848cd944 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Jan 14 17:12:54 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 14 17:12:54 2011 -0800 |
tree | 7b6281d84d3e62bf0042990c28055ae3e95f6de5 | |
parent | 4125d8ee68bec37fe471faeca7dfade73a7a1592 [diff] | |
parent | 27016763c7c0e568fb8eb26ab3d30282f027a72d [diff] |
am 27016763: merge from gingerbread * commit '27016763c7c0e568fb8eb26ab3d30282f027a72d':