commit | 18d0aaedc43de8f04acd4333f786f446b1ece46d | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed May 11 13:11:14 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 11 13:11:14 2011 -0700 |
tree | feb0d143e83b6279cbbb441ad5f518901be241bf | |
parent | 8e7a6f4a2b76974b5311ef48a652d6c39f1bdfcb [diff] | |
parent | 593226b6999f8861fe321a4ee56de1ade6800314 [diff] |
am 593226b6: (-s ours) am 1f91fbd3: (-s ours) fix build - don\'t prelink network.so - do not merge * commit '593226b6999f8861fe321a4ee56de1ade6800314': fix build - don't prelink network.so - do not merge