| commit | e14d20f38b94cfb97c8f56280cf3c33b31004a4f | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Wed Jul 15 06:16:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 06:16:21 2015 +0000 |
| tree | 47ce917974dbd592f476434fd9e085dcfdb14494 | |
| parent | 6b8094d6f3f9e664b3db48f78aa89162c60a45a3 [diff] | |
| parent | 1f0f6e952f23684783815597bc6ea9d048180013 [diff] |
am 1f0f6e95: am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe * commit '1f0f6e952f23684783815597bc6ea9d048180013': Fix CTS build