Dan Willemsen dc3b852125 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp ...

Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498

2016-03-23 15:31:32 -07:00

..

src/com/android/commands/svc

…

Android.mk

Remove custom copy rules, stop using ACP

2016-03-23 13:42:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

svc

…