OSDN Git Service

Merge changes I12810c1b,I62287a80,Ied96fdc3
authorDan Willemsen <dwillemsen@google.com>
Tue, 1 Mar 2016 23:19:33 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Mar 2016 23:19:33 +0000 (23:19 +0000)
am: a65b01fc09

* commit 'a65b01fc09b47c83e59dc4757c76eafba1e15cbc':
  Remove LOCAL_ACP_UNAVAILABLE
  Remove unused dependencies on $(ACP)
  Replace some uses of acp with cp

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge