summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/DockObserver.java
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2011-09-02 03:30:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-02 03:30:53 -0700
commit1d477c53bf2f389813d04d5163d210fccf00ceb9 (patch)
tree92062af9c5e1b627dc169218bbdbb239dbf7c9ed /services/java/com/android/server/DockObserver.java
parentee5e77cafec2eae70890abdcc1646ed39b06eddd (diff)
parentfc301b0bb5c635c6bb51b48c504a8db5f9010e5c (diff)
downloadframeworks_base-1d477c53bf2f389813d04d5163d210fccf00ceb9.zip
frameworks_base-1d477c53bf2f389813d04d5163d210fccf00ceb9.tar.gz
frameworks_base-1d477c53bf2f389813d04d5163d210fccf00ceb9.tar.bz2
Merge "Require INTERNET permission for network-based content. Bug #1870981"
Diffstat (limited to 'services/java/com/android/server/DockObserver.java')
0 files changed, 0 insertions, 0 deletions