tree 628f7217d055499b341107045c0c6ad0e0079717
parent 78be3f3fa422e7ade310f750bb779c4109af1a0e
parent 1eba16a5771fb8e5819af8addcb9f1714d1b3351
author Nicholas Sauer <nicksauer@google.com> 1423607081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423607081 +0000

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