commit | 92ec8f7720cb5232e1e07f21d9e53e17b298dfa2 | [log] [tgz] |
---|---|---|
author | JP Abgrall <jpa@google.com> | Wed Jul 15 05:50:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 05:50:51 2015 +0000 |
tree | 96863bb59cca7c1307e283558304ebf05fe94a34 | |
parent | 470d17043a32058f989ba5832cb5f0875ad29859 [diff] | |
parent | c4b48e7e39465eb0bb34d481e4dc46b5e8a4239c [diff] |
am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe * commit 'c4b48e7e39465eb0bb34d481e4dc46b5e8a4239c': Fix CTS build