tree 237e335b8cfa38a81e2229149dea360f563cbff9
parent 8bda0fb0ca24875ad6084f35250f166b45f967a1
parent 3274b9b7da6f3ee0ee0285deb955907adec52bad
author Android (Google) Code Review <android-gerrit@google.com> 1260994451 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1260994451 -0800

Merge change I10073d50 into eclair

* changes:
  Add Annotation for optional features.