| commit | c9a19779a219bd9e4dd162d30249be7d22020c67 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Mar 15 14:40:33 2016 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Mar 15 14:46:12 2016 -0700 |
| tree | ddf9d0a1888b91d25071389cc7e808582582e99d | |
| parent | 3912b35cfcb1896a0625164bf2163e7a6145ed8d [diff] | |
| parent | fc16dca6028559ff5c48cd65405e831f39869770 [diff] |
resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp Now we can remove all uses of $(ACP) in prebuilt_internal.mk. Change-Id: I07a449f3acca9b56c6a387ff8ca1535d19c872d1