am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree....
am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit 'f5f30067' into froyo-plus-aosp
* commit 'f5f30067':
DO NOT MERGE