tree 41b22f61ce558294891740e83af633b8c6e7a34b
parent ab2194aadeb35a1f2eae6c4d3abd476b33f167f4
parent bef31431cafe100e382a3caf7ea7dce343832d68
author Jean-Baptiste Queru <jbq@google.com> 1301944766 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301944766 -0700

am bef31431: No-op - reconcile with open-source gingerbread

* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':