tree 54b3ea2d20a31a3bcdd0ba32c66e781809e030a2
parent ee955b85ca2ddb1cfb83736a99bab7d3b886646e
parent 0969f15c56e984144ab952987ad6e3c330ff8028
author Nicholas Sauer <nicksauer@google.com> 1423603789 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423603789 +0000

am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '0969f15c56e984144ab952987ad6e3c330ff8028':
  Update Android CTS bandaid urls that use test_key1 to a new key