tree 8d8dea503f3e3d08c5f99fe442edb772d88a4e14
parent 7c22f6d9a2e9e1145a214c4eb5a0b94eecea2d84
parent e2617e7c1de3c9f4224baf3952a98a612e05bae2
author Nicholas Sauer <nicksauer@google.com> 1423609007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423609007 +0000

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