| commit | 923a98c77af2c6638b702ad8c24001ce6d3af379 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:52:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:52:31 2015 +0000 |
| tree | 5187e83aa07c720b9a15637f36d1a18ef13fe39b | |
| parent | 2d8ba854c5129ccfba11cf38f97d22a655b3766d [diff] | |
| parent | c03cc877846c5676eaaaf7b24a3b3aefec5f6b48 [diff] |
am c03cc877: 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: 75fb0 * commit 'c03cc877846c5676eaaaf7b24a3b3aefec5f6b48':