am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused...
am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit '1ec71365' into kraken
* commit '1ec71365':
DO NOT MERGE