tree cc30c347b90b7a9f6b1d5d57f73aacce229497c6
parent 26d352cdb019bed0b251348bf60df503ed6020db
parent ac08bc8a4827f300f6c9937ca4ec7497867b7895
author Nicholas Sauer <nicksauer@google.com> 1423603140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423603140 +0000

am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'ac08bc8a4827f300f6c9937ca4ec7497867b7895':
  Update Android CTS bandaid urls that use test_key1 to a new key