| commit | 21cd3a23b1a8f03b348533805738efb9d5da3000 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:02:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:02:52 2015 +0000 |
| tree | 44cf811598578ca6412bcc035c6dfc00c8d48277 | |
| parent | 1451c976d5af22812ce7fedd0456090acb6c7f81 [diff] | |
| parent | 8b3f4ba3b59fcbcfac519719a8700685091c037c [diff] |
am 8b3f4ba3: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 automerge: 5c9059d * commit '8b3f4ba3b59fcbcfac519719a8700685091c037c':