diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-25 15:05:51 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-11-25 15:05:51 -0500 |
| commit | 726a570258828d85e401ab62fd4220812fe9344f (patch) | |
| tree | 11af59ce57ec093c026aac8516bddc31cb031a5a /core/jni/Android.mk | |
| parent | 3fdee335fe95ab94ef1ee619ad37f9369447fde5 (diff) | |
| parent | dfaf2e03ad7c4d55ede1d2ef100ff4e21c04cd5c (diff) | |
| download | frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.zip frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.tar.gz frameworks_base-726a570258828d85e401ab62fd4220812fe9344f.tar.bz2 | |
resolved conflicts for merge of dfaf2e03 to master
Change-Id: I440d2042dd404a421789063e42102699fa33b7c0
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index ab9c852..c92a86c 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -55,7 +55,6 @@ LOCAL_SRC_FILES:= \ android_os_SystemClock.cpp \ android_os_SystemProperties.cpp \ android_os_UEventObserver.cpp \ - android_os_Hardware.cpp \ android_net_LocalSocketImpl.cpp \ android_net_NetUtils.cpp \ android_net_wifi_Wifi.cpp \ |