tree 83cce33a00ae3d620ee6c714af517907d29a6135
parent 923dc04127507794e6569aa525f904640c260092
parent f19518fcb1ef26db56094cfaaf9d8082ad30f316
author Xavier Ducrohet <xav@android.com> 1301353412 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301353412 -0700

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