tree 89864b8460b9c3ea2210e659d1487a3e7c255ebf
parent f8eb11d2f67a68d51efdfaad476d7b56fcd7bc36
parent d227508f51a4e3e57ee50e83fa4a12fc4696cc6f
author Jean-Baptiste Queru <jbq@google.com> 1285547340 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1285547340 -0700

reconcile froyo-release into gingerbread

Change-Id: I1f6934f548802643a03aba5fee0b13eb942b184c