am 316c0db4: (-s ours) Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo

Merge commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d' into kraken

* commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d':
  DO NOT MERGE
This commit is contained in:
Oscar Montemayor
2010-03-29 16:30:34 -07:00
committed by Android Git Automerger

Diff Content Not Available