tree 2c2022c577672473cf1d203b09ed85d556e2fb43
parent 9da61b0b46b671322698eff558d2ce2e63a478db
parent 8b77646ff7ac846efc59492a5d57360e2733f3a2
author Brian Muramatsu <btmura@android.com> 1302815376 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302815376 -0700

am 8b77646f: am ffcd2e48: am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread

* commit '8b77646ff7ac846efc59492a5d57360e2733f3a2':
  Remove RequiredFeatures Annotation