Revert "am 047f9d12: Merge "resolved conflicts for merge ofb2f5decato honeycomb-plus-aosp" into honeycomb-plus-aosp" This reverts commitfbba87d35f, reversing changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
Revert "am 047f9d12: Merge "resolved conflicts for merge ofb2f5decato honeycomb-plus-aosp" into honeycomb-plus-aosp" This reverts commitfbba87d35f, reversing changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.