OSDN Git Service

am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Tue, 28 Aug 2012 20:42:26 +0000 (13:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Aug 2012 20:42:26 +0000 (13:42 -0700)
commit2c83b09034d5be5369168697eab3e825ef13610d
tree628f640c04ab8a9d9dda8ed696c8fb9ee1926563
parent759f05a2cbd6ece18c95bc415bd22f0847540c78
parentd5096c6a5c59a0f78833ea86b620bfbedc863aba
am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev

* commit 'd5096c6a5c59a0f78833ea86b620bfbedc863aba':
  Use gold linker on x86