| commit | cbe615bd7644a5bd632efff4533ad319a0fd01b9 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Aug 27 04:41:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 04:41:23 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | 8db9b00bed51d10e846ee2831a274b1ce0fa6833 [diff] | |
| parent | e14d20f38b94cfb97c8f56280cf3c33b31004a4f [diff] |
am e14d20f3: (-s ours) am 1f0f6e95: am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe * commit 'e14d20f38b94cfb97c8f56280cf3c33b31004a4f':