tree fabc8d2b9367db2b69ef2ab91b4fa5d6533077b8
parent d56ad65dafb8dfbf111cbe8d42c2cbcc593f6e8f
parent 29d74ad5ce67238f7f03d4b52ce7cb4fa94a24c0
author Brian Muramatsu <btmura@android.com> 1360265030 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360265030 -0800

am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev

# By Leo Liao
# Via Brian Muramatsu (1) and Gerrit Code Review (1)
* commit '29d74ad5ce67238f7f03d4b52ce7cb4fa94a24c0':
  Add missing features of JELLY_BEAN to feature list