tree 90662b8f2248fcee8c135f7e3dcbcb30d5764c72
parent 7f541d6d9af80f3479285c40f935cfc4bf4a6394
parent 5028a1a1b5534a5abc4f15cb5ae0c1a5f0554a90
author Nicholas Sauer <nicksauer@google.com> 1423607474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423607474 +0000

am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

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