tree b2ca02aad5c7286e38071538e8ab9ca45e133a72
parent e2d5577e86390ee769bb417a5e09133e7d133ae6
parent 9775ffe5fd3b8498137edf59c7570c4639a73763
author Xavier Ducrohet <xav@android.com> 1301353117 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301353117 -0700

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

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