am 85dd1735: Merge b7ea5aca to honeycomb-plus-aosp

* commit '85dd17355c7080ca89b299db5044eaeffb4ff315':
  Current files for source.android.com