tree 142fabab1870c24b5154d63ad1f7ae2252597aef
parent 358d417bea655379290b765e7d9e1e35218c055d
parent 6c4b47ffbd69cc66d8f6ba4ca3d014289e4dc006
author Nicholas Sauer <nicksauer@google.com> 1432829687 +0000
committer android-build-merger <android-build-merger@google.com> 1432829687 +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
automerge: 6c4b47f

* commit '6c4b47ffbd69cc66d8f6ba4ca3d014289e4dc006':