tree acf5235ce48f2b44723b40393b2013713d42c85c
parent 9f02f1a3221b0192a51663b23833583bce92d62d
parent a15ba0e78092f464b6785ff60e9deea24cd35b72
author Nicholas Sauer <nicksauer@google.com> 1432829649 +0000
committer android-build-merger <android-build-merger@google.com> 1432829649 +0000

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
automerge: a15ba0e

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