am b774f261: am ff3b3ade: Merge "Revert "Temporary Changes for certification...
am b774f261: am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
* commit 'b774f261':
Revert "Temporary Changes for certification of SCO."