OSDN Git Service

resolved conflicts for merge of 34cb6460 to master
authorJustin Koh <justinkoh@google.com>
Tue, 11 Feb 2014 19:25:37 +0000 (11:25 -0800)
committerJustin Koh <justinkoh@google.com>
Tue, 11 Feb 2014 19:26:14 +0000 (11:26 -0800)
commitf26c96edc5ce0d67f9dc35c95eea91ab92ea9c64
treefbf7e3629351cbae3f8742b52d14a9f80e528094
parent60250d42a11a6e97366843d4940cde2c010027fa
parent34cb64607737562e25afdf08680886856d7ff668
resolved conflicts for merge of 34cb6460 to master

Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
target/product/core_tiny.mk