tree 98cb4c27d575bf3aaf26ebf3de34d70899daf370
parent 77b122f551ae37811c75ae76fa2029f7b3f2f404
parent 480d3b1324d58432d7c9da914debfaca3e8529c9
author Jean-Baptiste Queru <jbq@google.com> 1285547407 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1285547407 -0700

reconcile froyo-release into gingerbread

Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985