OSDN Git Service

am 85754ea5: am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
authorRaphael Moll <raphael@google.com>
Thu, 14 Mar 2013 19:49:54 +0000 (19:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Mar 2013 19:49:54 +0000 (19:49 +0000)
commitfc0d3f13bb59d679f44c744f2c82ef10baa8b5ae
treed4799174b3fe5a1f475936d94404fd05e35d67df
parent34247824d80da876ffd4b7d0e700036fb47eef35
parent85754ea5f2ebd118d621a9b553edb4e8763001c4
am 85754ea5: am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev

* commit '85754ea5f2ebd118d621a9b553edb4e8763001c4':
  Build SDK using prebuilts/devtools.
target/product/mini.mk
target/product/sdk.mk