OSDN Git Service

resolved conflicts for merge of 0a694f4c to master
authorYing Wang <wangying@google.com>
Fri, 25 Apr 2014 16:28:00 +0000 (09:28 -0700)
committerYing Wang <wangying@google.com>
Fri, 25 Apr 2014 16:28:00 +0000 (09:28 -0700)
commit8d4562a14da90789f39579e1133a707003b60c0c
tree5d766b1932517f7e4478fb17f99259f0b392b9fc
parent6ee3c4327d706c6bb0c0875f3094ab43bf96a7fd
parent0a694f4c57a20e00d2939c043fac78acdcb7479d
resolved conflicts for merge of 0a694f4c to master

Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
target/product/base.mk
target/product/core.mk