tree 121218e62356548d2ad5c8ef9ab689e6a45a39cd
parent 0ee0fa2f625c61ee6e631dceb0ee81918fd96df3
parent 28e88a79851ecabf3388cb3f50c67ecd4fdeaaa9
author Brian Muramatsu <btmura@android.com> 1360265790 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360265790 -0800

am 28e88a79: am 1792efc9: am 0f39674f: am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev

# By Leo Liao
# Via Android Git Automerger (4) and others
* commit '28e88a79851ecabf3388cb3f50c67ecd4fdeaaa9':
  Add missing features of JELLY_BEAN to feature list