commit | 3d50869601d3eb69f278f29c4bbd152e05b324d9 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:46:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:46:19 2015 +0000 |
tree | 5187e83aa07c720b9a15637f36d1a18ef13fe39b | |
parent | 761076eec80edc34041a6a6c0928f0381f4bf7f4 [diff] | |
parent | 48169ababa58ac82873bb0d485568e620723d054 [diff] |
am 48169aba: am fce14b18: am ecd9ca31: am eccbd817: 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: 2614d * commit '48169ababa58ac82873bb0d485568e620723d054':