tree f463331f33bd86cb266fe9a619e12348cc73f05e
parent cb6baebbd563439f0611070759406f5f9f1e3024
parent b23d0a69bfc3822c43bd20be9d0c1b6dfd2ac82f
author Ye Wen <ywen@google.com> 1415136858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415136858 +0000

am b23d0a69: (-s ours) Merge new SDK prebuilt. DO NOT MERGE automerge: 4f95454  -s ours

* commit 'b23d0a69bfc3822c43bd20be9d0c1b6dfd2ac82f':
  Merge new SDK prebuilt. DO NOT MERGE