tree 3b400e2e7149062c457b9efe0f59cb3cb65fd7c2
parent d121e03ca26a0f057ee2eaa2bfd6764cecef0924
parent 6dd2d0f5dcefff00b27747a88ec66cdc9b16de0c
author Nicholas Sauer <nicksauer@google.com> 1423608644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423608644 +0000

am 6dd2d0f5: am 2772992b: am 6614394a: 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 '6dd2d0f5dcefff00b27747a88ec66cdc9b16de0c':
  Update Android CTS bandaid urls that use test_key1 to a new key