tree 6fccee85c22c4d5d05e6cb1caa1e6b8e89b69f01
parent 2dbf0177ec1cf0895c3f4b0e166048f13b2ce853
parent 2772992b7da57838cfbe1c6d48281d84798e3040
author Nicholas Sauer <nicksauer@google.com> 1423608313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423608313 +0000

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