tree 78835eaa67273cdcb48e204f1c8288769b31ecff
parent 0bfc3973760b4f72ca96c6bdbf875051bcdb57f5
parent 1d587e3d5d91fab1cf3048bbeeafa86445cbd08c
author Jim Miller <jaggies@google.com> 1273188983 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1273188983 -0700

Merge "Manual integration of I32a7b5 from froyo" into kraken