| commit | eccbd817cbecd7a821b5a75ab50ec81f3eaa79b2 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 16:31:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 16:31:05 2015 +0000 |
| tree | 44cf811598578ca6412bcc035c6dfc00c8d48277 | |
| parent | 5804cb37d0dbd851f4044fc210de3835724735a6 [diff] | |
| parent | 214e596affa0387c6f11db7a4633c6ab9e56c701 [diff] |
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 '214e596affa0387c6f11db7a4633c6ab9e56c701':