tree 7c847cad80fa81bad817d701a60ed77d0bb900f7
parent d72d0954090e5b2b565034a224d3081909b73c1a
parent 2dbf0177ec1cf0895c3f4b0e166048f13b2ce853
author Nicholas Sauer <nicksauer@google.com> 1423590373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423590373 +0000

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

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