tree e699648a4eaffbafbb3e135917fac12debec7714
parent 1117c69fe40dccfa6090d184094c4a6d407ab8d6
parent 82da01d6a32c4fbfe57155c119d4669d7faba438
author Jean-Baptiste Queru <jbq@google.com> 1306963391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306963391 -0700

am 82da01d6: Merge from gingerbread

* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':