tree 282abb536993926dc81e2e9d17fba82c95161d8c
parent 734def68d2fbe90c53b81442c202000b3db8f1a7
parent f4009752ad045891b04aecd92785c2653e8e8509
author Nicholas Sauer <nicksauer@google.com> 1442336389 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442336389 +0000

am f4009752: 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 automerge: 2614df0

* commit 'f4009752ad045891b04aecd92785c2653e8e8509':