OSDN Git Service

Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
authorXavier Ducrohet <xav@google.com>
Fri, 9 May 2014 01:41:34 +0000 (18:41 -0700)
committerXavier Ducrohet <xav@google.com>
Fri, 9 May 2014 01:48:26 +0000 (18:48 -0700)
commita6a2969e020ea16edbe24661d2b63f7f2bdf98b6
tree20418d66af620c1c16281c39524879d6ebac605e
parentaf3f1a54545dadc4606b74e16416712fbd3efecf
parent05a7a955c12318a8f44c1fea467afde96a45342b
Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
core/Makefile