tree e66110ac0ca0a99db02f89d6d0736899dee07b63
parent 40cbb1696d6182a165ec9b16e81bf994810de5b3
parent dd19a875e2743e1f8003422d29c5584909793c7b
author Stephen Hines <srhines@google.com> 1322524321 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322524321 -0800

am dd19a875: Merge "Add test for API level 15."

* commit 'dd19a875e2743e1f8003422d29c5584909793c7b':
  Add test for API level 15.