tree abfa5e36d19abddbb1ac17fd6968b63ae1caa99a
parent 56f85dcd527c01b5eec3d2c1d9a84544c77ee1f4
parent 0f39674fa6ff09f03f89bc6ad88db4acdf2d0baf
author Brian Muramatsu <btmura@android.com> 1360265393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360265393 -0800

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 (2) and others
* commit '0f39674fa6ff09f03f89bc6ad88db4acdf2d0baf':
  Add missing features of JELLY_BEAN to feature list