tree e7a56b8850eaee1d0c3b4bf4a3acd9e03e2ffc63
parent 430eeb70a70bea7b79a7298b9f883aed645637c2
parent b55ee96b0345250e56090b0b566f9eead69c1bbd
author Nicholas Sauer <nicksauer@google.com> 1423604925 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423604925 +0000

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 'b55ee96b0345250e56090b0b566f9eead69c1bbd':
  Update Android CTS bandaid urls that use test_key1 to a new key