am 096b2ddd: 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 (2) and others
* commit '096b2ddd64497e242247693bbd5adc954ba27c38':
  Add missing features of JELLY_BEAN and JELLY_BEAN_MR1 to feature summary list