diff options
author | Simon Busch <morphis@gravedo.de> | 2012-02-03 20:34:15 +0100 |
---|---|---|
committer | Simon Busch <morphis@gravedo.de> | 2012-02-03 20:34:15 +0100 |
commit | e8bec379a346442f3719eb3e76fbf79697622754 (patch) | |
tree | 0ce63e73fc639f49619cc1e2e48205b02aa20e81 /Android.mk | |
parent | c41dcc61f8271b1459f2ae6d27777b5580c08a6b (diff) | |
parent | 1789f2ac0766851f078c754fe31cb87a6f013184 (diff) | |
download | external_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.zip external_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.tar.gz external_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.tar.bz2 |
Merge remote-tracking branch 'origin/paulk/rework-device-specific' into morphis/rework-device-specific
Conflicts:
include/radio.h
samsung-ipc/ipc.c
samsung-ipc/ipc_private.h
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -37,6 +37,7 @@ endif samsung-ipc_files := \ samsung-ipc/ipc.c \ samsung-ipc/ipc_util.c \ + samsung-ipc/ipc_devices.c \ samsung-ipc/util.c \ samsung-ipc/rfs.c \ samsung-ipc/gen.c \ |