tree 639bc75a31488e82c7ff9d256c71f62e842eefea
parent b49c8250f8ef1de9a3bfca2fa0c0363c16a1c68a
parent 7f541d6d9af80f3479285c40f935cfc4bf4a6394
author Nicholas Sauer <nicksauer@google.com> 1423508151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423508151 +0000

am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

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