summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/Proxy.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-12-02 17:56:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-02 17:56:09 +0000
commitca017a38c9eb12fe92d24a72ad3ee4c33b00e5de (patch)
tree0790c156be631185438a704b6115cf4b0e3718fe /core/java/android/net/Proxy.java
parent9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf (diff)
parent50f513c56989337aa0a48304213dd1deee2a0ede (diff)
downloadframeworks_base-ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de.zip
frameworks_base-ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de.tar.gz
frameworks_base-ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de.tar.bz2
am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
* commit '50f513c56989337aa0a48304213dd1deee2a0ede': [ActivityManager] Invalidate last screenshot when activity relaunched
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions