tree 2f4f60018acdc2d52d139c1d4a81850d367e9dc8
parent 47015057b1d03b7605487e2f94d563c976321cd5
author Michael Jurka <mikejurka@google.com> 1301540048 -0700
committer Michael Jurka <mikejurka@google.com> 1301540232 -0700

Fix the build

Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"

This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.