Reconcile with gingerbread-release

Change-Id: I9ae917b71743cddf46bf22cd1255a7321c0ed467
main
Jean-Baptiste Queru 2011-06-07 10:42:41 -07:00
commit 0756a96230

Diff Content Not Available