tree 03d580b501e5648a4929fed2326fae58a164bf6f
parent 3141e94cab4f619c786b5b5ce0cb916c6f0989e3
parent c14d4c6c9386e7e1711b2caef3e53d3480a0c888
author Brian Muramatsu <btmura@google.com> 1303341385 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303341385 -0700

am c14d4c6c: am b959cbed: am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'c14d4c6c9386e7e1711b2caef3e53d3480a0c888':