OSDN Git Service

resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 4 Feb 2015 19:28:56 +0000 (11:28 -0800)
committerYing Wang <wangying@google.com>
Wed, 4 Feb 2015 19:28:56 +0000 (11:28 -0800)
commit16ba2ed82bc084d5355477a381cc0bcc8b60a7bd
tree742bfd2bf13d8b399bfdd78fd684213dd19768ca
parente9bc7b472db2d54aaef428fc3229b56dbe2bf6fa
parent4c178ebcc0069b6f806de4df491bc9a7e1b9d78e
resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp

Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
core/main.mk
core/product.mk