summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/IntentResolver.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-04-11 21:11:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-11 21:11:44 +0000
commitccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a (patch)
tree08c77b20358321f4f2aed91aa7a23ed5ff0034fd /services/java/com/android/server/IntentResolver.java
parentc65e463356e9c8b646e80d0bfb6cfc76a0a1b426 (diff)
parenta9bebc221108dd679da0557963605cd704d05743 (diff)
downloadframeworks_base-ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a.zip
frameworks_base-ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a.tar.gz
frameworks_base-ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a.tar.bz2
Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
Diffstat (limited to 'services/java/com/android/server/IntentResolver.java')
0 files changed, 0 insertions, 0 deletions