| commit | 3c8cc74f81d0f81204bd827076889bb51143dff8 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 27 14:02:54 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 27 14:02:54 2011 -0700 |
| tree | 0547b326fdc3973af97a54bcc725bacc2b16540c | |
| parent | 26e0d49fa743d7881104196a9eda733bd2aac92f [diff] [blame] | |
| parent | 80adaddfe0a997d7c9f45fafbd6f8b05e14d119c [diff] [blame] |
resolved conflicts for merge of 80adaddf to master Change-Id: I53c036b229352430c3faf57ce1d02fa889827690
diff --git a/Android.mk b/Android.mk index 3f4f5dd..8045ad7 100644 --- a/Android.mk +++ b/Android.mk
@@ -19,6 +19,7 @@ NetlinkManager.cpp \ PanController.cpp \ PppController.cpp \ + ResolverController.cpp \ SoftapController.cpp \ TetherController.cpp \ ThrottleController.cpp \ @@ -26,7 +27,6 @@ main.cpp \ - LOCAL_MODULE:= netd LOCAL_C_INCLUDES := $(KERNEL_HEADERS) \