tree 6e464a2c0ca1d011ce9385898101276e0744826e
parent 61cdc41ab98caca6e45519e5b102af82b88d28b6
parent 3643c656d6e3f0fb7c340779d25232a0b76d0af3
author Jean-Baptiste Queru <jbq@google.com> 1306963600 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306963600 -0700

am 3643c656: Merge from gingerbread

* commit '3643c656d6e3f0fb7c340779d25232a0b76d0af3':