commit | a7eb384446438c905ba594d9ae13a6385a6ed245 | [log] [tgz] |
---|---|---|
author | JP Abgrall <jpa@google.com> | Wed Jul 15 06:03:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 06:03:47 2015 +0000 |
tree | fb059e12b86981234fc28bcf4341ae1f5871d3c5 | |
parent | e14505920652645508e4a32b865e126b67f06d29 [diff] | |
parent | 1583dca5ec03dc85ee48f22863600743ceb6dd77 [diff] |
am 1583dca5: am b5010ce1: am 4e7386bd: am f10c7fad: Merge "Fix CTS build" into lollipop-cts-dev automerge: f6b2775 * commit '1583dca5ec03dc85ee48f22863600743ceb6dd77': Fix CTS build