OSDN Git Service

resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
authorVikas Marwaha <vikasmarwaha@google.com>
Thu, 9 Jun 2016 03:14:48 +0000 (20:14 -0700)
committerDan Willemsen <dwillemsen@google.com>
Thu, 9 Jun 2016 05:46:40 +0000 (05:46 +0000)
commit98dce87fe17fb7795ff531b2f2f58ecfa503b586
treeaebf289b605beb94740958c1d5e369fb3f2d4254
parent74da7c9272f0492327d9b0cd66eb46db2f2ac964
parent07886f17af0be2f92c94d0d40822170f30440a15
resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp

Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
core/product.mk