am f19518fc: am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1

* commit 'f19518fcb1ef26db56094cfaaf9d8082ad30f316':
  Update SDK files to API 12/Android 3.1