tree acf5235ce48f2b44723b40393b2013713d42c85c
parent c5b507e363929514763e6626ab9f9fa791ec572a
parent 86eecf4686b510fcbe6316f77414d30fb9c50390
author Nicholas Sauer <nicksauer@google.com> 1423606233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423606233 +0000

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