OSDN Git Service

resolved conflicts for merge of d86f39ca to stage-aosp-master
authorYing Wang <wangying@google.com>
Tue, 4 Aug 2015 20:36:07 +0000 (13:36 -0700)
committerYing Wang <wangying@google.com>
Tue, 4 Aug 2015 20:36:07 +0000 (13:36 -0700)
commitbd555f1523ec3faafe1e3c6cefce9fe0c96090c1
tree09d16e3dfce6d31fe3146d93c8d4112a0b649ecc
parent5c78a488d0b7d293c254493a9fc5fc71bc50b011
parentd86f39cab79e11696ff23c836df73c421fd401e2
resolved conflicts for merge of d86f39ca to stage-aosp-master

Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
core/definitions.mk