OSDN Git Service

am 8d4562a1: resolved conflicts for merge of 0a694f4c to master
authorYing Wang <wangying@google.com>
Fri, 25 Apr 2014 16:31:55 +0000 (16:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 16:31:55 +0000 (16:31 +0000)
commitbeefce58dc9e1987143391634c09249d478bd598
treec4e62c0037866873cc0bcf81baa9b8134dd9c8c3
parent9fe33ae85783f8e79ffb624486efc3c6a69a3868
parent8d4562a14da90789f39579e1133a707003b60c0c
am 8d4562a1: resolved conflicts for merge of 0a694f4c to master

* commit '8d4562a14da90789f39579e1133a707003b60c0c':
  Remove libs from target/product/base.mk.
target/product/core.mk