tree ad18bfb14e459e3d2e5c3e0eb2a738c5424d4f17
parent 46d82f0ba33dd35fe3307a65d50e9544fdc8247e
parent f9a6b37b56ec119a62af9c3833901c3193b86348
author Nicholas Sauer <nicksauer@google.com> 1423604501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423604501 +0000

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