OSDN Git Service

resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 2 May 2012 22:22:34 +0000 (15:22 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 2 May 2012 22:24:32 +0000 (15:24 -0700)
commit5af27de0b59b3a49298066a652d9fa37ff71cbf0
treed6ae9f810b4a126cf6dcf8fc18188ecddd6abedd
parent9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5
parent343597c3aa4e17bdba4c911d081a6d161fb1c758
resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp

Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
target/product/sdk.mk