OSDN Git Service

resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
authorRaphael Moll <raphael@google.com>
Thu, 14 Mar 2013 19:41:16 +0000 (12:41 -0700)
committerRaphael Moll <raphael@google.com>
Thu, 14 Mar 2013 19:42:04 +0000 (12:42 -0700)
commitcdfb5bac3a5721b895cea4789ac2384ff6546992
treec34f6906b685bb6d1a9c73def341373b2937be40
parent6e2d53a5cdcc99e3927ae5db537dd74eb5474daf
parenta3aea5b6eba3007b02b6a44d8eccb6883037278d
resolved conflicts for merge of a3aea5b6 to jb-mr2-dev

Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
core/main.mk
target/product/core.mk
target/product/mini.mk
target/product/sdk.mk