OSDN Git Service

am cc21582f: resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Nov 2010 19:10:14 +0000 (11:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Nov 2010 19:10:14 +0000 (11:10 -0800)
commit2248e68003c61dae8fa8083e342c523d477922d6
tree8ededcfe37e87b82d2a15638b68d9bab78aa80a4
parent1804025f53148b9f04ea0437467f32a754c3a675
parentcc21582fb3699e5384dc38dad45a575451375d1a
am cc21582f: resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp

* commit 'cc21582fb3699e5384dc38dad45a575451375d1a':
  Correct makefile test for stagefright build