tree 0470f4b79904b01d993b2d92c6db5bf0f75cc86d
parent a4802174105d175a12534283deb3582d509c4cd9
parent ecd9ca314cb9c00741fd3be37de3bfdfb51755b7
author Nicholas Sauer <nicksauer@google.com> 1432832221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432832221 +0000

am ecd9ca31: am eccbd817: am 214e596a: 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 automerge: f400975

* commit 'ecd9ca314cb9c00741fd3be37de3bfdfb51755b7':