summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAndy Stadler <stadler@google.com>2012-09-18 14:20:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-18 14:20:30 -0700
commitab3d0fd684eabecd6b290ef3cb9799739db04ca3 (patch)
treecb791a37b6e442e324a4694f8c102a1435094929 /services
parent48618c987eed656bf3d8baa6ce25b7f5d3f4a43e (diff)
parentd44daaba447e42c0b75d4cf5d33cf0b6ea3076b5 (diff)
downloadframeworks_base-ab3d0fd684eabecd6b290ef3cb9799739db04ca3.zip
frameworks_base-ab3d0fd684eabecd6b290ef3cb9799739db04ca3.tar.gz
frameworks_base-ab3d0fd684eabecd6b290ef3cb9799739db04ca3.tar.bz2
Merge "Move files to make eclipse-java happy" into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/updates/CertPinInstallReceiver.java (renamed from services/java/com/android/server/updatable/CertPinInstallReceiver.java)0
-rw-r--r--services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java (renamed from services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java)0
-rw-r--r--services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java (renamed from services/tests/servicestests/src/com/android/server/updatable/CertPinInstallReceiverTest.java)0
3 files changed, 0 insertions, 0 deletions
diff --git a/services/java/com/android/server/updatable/CertPinInstallReceiver.java b/services/java/com/android/server/updates/CertPinInstallReceiver.java
index c03fbc3..c03fbc3 100644
--- a/services/java/com/android/server/updatable/CertPinInstallReceiver.java
+++ b/services/java/com/android/server/updates/CertPinInstallReceiver.java
diff --git a/services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java b/services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java
index a74a648..a74a648 100644
--- a/services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java
+++ b/services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java
diff --git a/services/tests/servicestests/src/com/android/server/updatable/CertPinInstallReceiverTest.java b/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java
index b6742a1..b6742a1 100644
--- a/services/tests/servicestests/src/com/android/server/updatable/CertPinInstallReceiverTest.java
+++ b/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java