| commit | c7893719e61875cfe92d95585888535fb1e71dd3 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Jul 25 19:18:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 19:18:14 2014 +0000 |
| tree | 35ee56ef560507ad0971aa0cda0b1656a4808394 | |
| parent | 6c7cfdc1957de8c62025a67143d9b2826a3ae39c [diff] | |
| parent | 8cac6317c5301ae1235fcb1e1befa4c6ca3ca185 [diff] |
am 8cac6317: resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp * commit '8cac6317c5301ae1235fcb1e1befa4c6ca3ca185': Update frame-larger-than limit to 2440 for new clang.