am 9bebe311: am 346c507f: Merge "Updated for framework API changes" into gingerbread

Merge commit '9bebe31160109ffec448bb45a875b363f78f35ec'

* commit '9bebe31160109ffec448bb45a875b363f78f35ec':
  Updated for framework API changes