am 945ef0b9: (-s ours) am d4446193: Merge "Add missing features of JELLY_BEAN and JELLY_BEAN_MR1 to feature summary list"

# By Leo Liao
# Via Android Git Automerger (1) and others
* commit '945ef0b986175b57c956888289b0656468d26669':
  Add missing features of JELLY_BEAN and JELLY_BEAN_MR1 to feature summary list