tree f658ecf41e28af2b882c2876a55f2320e8f2c9cc
parent 56f8408e43d0ac9e36aab6a34fbdf90398aa4377
parent 5ff9fd62fb0eca575c55c3dd3d0484396f42d4e3
author Xavier Ducrohet <xav@android.com> 1340328159 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340328159 -0700

am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev

* commit '5ff9fd62fb0eca575c55c3dd3d0484396f42d4e3':
  Update the API 16 files used by the SDK.