tree d49345499ef85eea0b5cf4bc0ac44c0df2aded7b
parent 2786d21ddeeb2a46733fbac1afd6533b093d70ee
parent b43b35a034ad667ba749270537155e7534906153
author Xavier Ducrohet <xav@android.com> 1260994792 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260994792 -0800

am b43b35a0: am e6547423: Merge change I10073d50 into eclair

Merge commit 'b43b35a034ad667ba749270537155e7534906153'

* commit 'b43b35a034ad667ba749270537155e7534906153':
  Add Annotation for optional features.