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 '0f39674f': Add missing features of JELLY_BEAN to feature list