tree d920e140b8050f8b5a63dfa5228140093931adfa
parent 888442b44c4f041fba6050cb25a64454b9a04aa7
parent 0744f81e19ad40bdd73648adc5197c4a2d770321
author Nicholas Sauer <nicksauer@google.com> 1423846389 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423846389 +0000

am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

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