OSDN Git Service

resolve merge conflicts of 9d73af0 to stage-aosp-master
authorAndreas Gampe <agampe@google.com>
Fri, 1 Jul 2016 04:42:44 +0000 (21:42 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 1 Jul 2016 04:42:44 +0000 (21:42 -0700)
commitae492fd5f2468ac128b65ec4ae0f4d513c68ee60
treed70d0c89b8f3ad255a34adf4bc70f0b0ae07cfba
parent80b32402dced361a2ea8fc4804753fe0f4ad2981
parent9d73af09346247352cd3eea8bbc857432ced6c32
resolve merge conflicts of 9d73af0 to stage-aosp-master

Change-Id: I984c48310e72cb509b859501cfb07258214038fa
core/product.mk
core/product_config.mk