OSDN Git Service

resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 10 Jun 2014 16:45:45 +0000 (09:45 -0700)
committerYing Wang <wangying@google.com>
Tue, 10 Jun 2014 16:45:45 +0000 (09:45 -0700)
commit2d19cbd279ed69c7202f089be174c35c1585f709
tree8a5245d9397ec6a4c28545930b9cc13aca3984f8
parentb06c655e580e683c44354cda8a9fbcd8f30efab6
parent135e11df38254fca076c5e4f8e0329a62e1454c5
resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp

Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
CleanSpec.mk
core/Makefile