tree 1b3e4ea2cb7907c9d5d7a2d390e9566ed54d2ea7
parent 7f72ad7934d048a6fda0ff1ac781c2166f4ea25d
parent f84b25243d7ebeaca8424171f5ca3b192cc76d80
author Jean-Baptiste Queru <jbq@google.com> 1307569620 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307569620 -0700

am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':