diff options
author | Joe Onorato <joeo@android.com> | 2010-04-06 23:47:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 23:47:52 -0700 |
commit | 62accbcbaf69b76d502944edfe0155cf89e9ac80 (patch) | |
tree | 51510c3e3989951a1498dd8a714b9ea52011a2f8 /policy | |
parent | ff28490f5cb9b8d0ed0f6328b496c65d3209962f (diff) | |
parent | 02d8d1e036fcb65ecf6b3deb8fe4b37214279bfc (diff) | |
download | frameworks_base-62accbcbaf69b76d502944edfe0155cf89e9ac80.zip frameworks_base-62accbcbaf69b76d502944edfe0155cf89e9ac80.tar.gz frameworks_base-62accbcbaf69b76d502944edfe0155cf89e9ac80.tar.bz2 |
am 02d8d1e0: am a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken
Diffstat (limited to 'policy')
-rw-r--r-- | policy/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/policy/Android.mk b/policy/Android.mk index 0e9d86d..a887142 100644 --- a/policy/Android.mk +++ b/policy/Android.mk @@ -7,7 +7,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(call all-subdir-java-files) -LOCAL_MODULE := android.policy_phone -LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_MODULE := android.policy -#include $(BUILD_JAVA_LIBRARY) +include $(BUILD_JAVA_LIBRARY) |