tree 1b79e10d4de58cd9512b550135efc7e93ab1bec2
parent 4056c9ed07af3098430287b3f891671b6557db5e
parent d6ad59ae43591b025a2ed7a438120aa970204a0d
author Brian Muramatsu <btmura@google.com> 1303121867 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303121867 -0700

am d6ad59ae: am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d':