tree 7d5330152c49ca35fd3948d913acff0edebb6230
parent 23cc0908a81ce3fc4ecdd8d95cfa898496422596
parent 39cb8b4cc20e5567e44ae9f959cca1409b86e056
author Xavier Ducrohet <xav@android.com> 1260994584 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260994584 -0800

am e6547423: Merge change I10073d50 into eclair

Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp

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