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

Merge commit '346c507f0be9b40d77f656fd5a548ba7bba1f342' into gingerbread-plus-aosp

* commit '346c507f0be9b40d77f656fd5a548ba7bba1f342':
  Updated for framework API changes