| commit | adaa1e0df5b6226c8f44c75c015ab656cfe7a45d | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:11:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:11:16 2015 +0000 |
| tree | 5d4f41678c28d308029691c498cfb3acbfd3eb8e | |
| parent | a96b34638875bf36b491191052eed7a644bfb6e2 [diff] | |
| parent | 21cd3a23b1a8f03b348533805738efb9d5da3000 [diff] |
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: 5c9059d * commit '21cd3a23b1a8f03b348533805738efb9d5da3000':