| commit | c03cc877846c5676eaaaf7b24a3b3aefec5f6b48 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:35:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:35:20 2015 +0000 |
| tree | 0470f4b79904b01d993b2d92c6db5bf0f75cc86d | |
| parent | b2d5c7e36ce3aff1398b200e4e48160f6881f7c6 [diff] | |
| parent | cc2fad6a205e822df28644ecb09a8fdb29151745 [diff] |
am cc2fad6a: am adaa1e0d: am 21cd3a23: 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: * commit 'cc2fad6a205e822df28644ecb09a8fdb29151745':