tree 7f3b02c9d84cd8b209841a627f98b2a7cda17ef6
parent c223530e8d0c6e2d251e7de8c1767491a2a175e5
parent c428e10ec137da41cb66008ad76db2b12407b193
author keunyoung <keunyoung@google.com> 1363977470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363977470 +0000

am c428e10e: Merge "lock TestDeviceSetup to one SDK to allow running PTS for older systems" into jb-mr2-dev

* commit 'c428e10ec137da41cb66008ad76db2b12407b193':
  lock TestDeviceSetup to one SDK to allow running PTS for older systems