OSDN Git Service

resolved conflicts for merge of cd3bd740 to master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 24 Oct 2010 13:08:24 +0000 (06:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 24 Oct 2010 13:08:24 +0000 (06:08 -0700)
commit5002433ba8c12bc7f373e402bf69fea8f1dfed76
tree0aa105ee9750beddc81b074a16252893609e2a1b
parentdd15bec71f23ad3364c4ae62fc47213dc976e861
parentcd3bd7402f64873ea8dc23d5a6c53b1733373347
resolved conflicts for merge of cd3bd740 to master

Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
target/product/full_base.mk