tree 3772d3d7ebb950d4edc3e17d7cc0a3e05041ec38
parent b3deaf8371a649770e472408475b6201def060f3
parent dd168c0afe58b87f67066e1f259fd3ed998a4d22
author Jean-Baptiste Queru <jbq@google.com> 1306963609 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306963609 -0700

am dd168c0a: Merge from gingerbread

* commit 'dd168c0afe58b87f67066e1f259fd3ed998a4d22':