commit | 1f0f6e952f23684783815597bc6ea9d048180013 | [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 | 409d97aed7b951cb7b5280715cdbd293289044a3 | |
parent | 0852bee4a9b363de1c361b1a12564dc59ded1771 [diff] | |
parent | 92ec8f7720cb5232e1e07f21d9e53e17b298dfa2 [diff] |
am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe * commit '92ec8f7720cb5232e1e07f21d9e53e17b298dfa2': Fix CTS build