| commit | 2248e68003c61dae8fa8083e342c523d477922d6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 11:10:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 11:10:14 2010 -0800 |
| tree | 8ededcfe37e87b82d2a15638b68d9bab78aa80a4 | |
| parent | 1804025f53148b9f04ea0437467f32a754c3a675 [diff] | |
| parent | cc21582fb3699e5384dc38dad45a575451375d1a [diff] |
am cc21582f: resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp * commit 'cc21582fb3699e5384dc38dad45a575451375d1a': Correct makefile test for stagefright build