summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/ProxyDataTracker.java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-18 02:44:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-18 02:44:06 +0000
commita850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44 (patch)
treeee5c33ebb844fab186010b4a319c8a7e6ccd9a15 /core/java/android/net/ProxyDataTracker.java
parente2c9cd583f4f706b48270b8cbe84df627c69af24 (diff)
parent8815d261d9fefbac8f24936dc37a055ab9ced038 (diff)
downloadframeworks_base-a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44.zip
frameworks_base-a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44.tar.gz
frameworks_base-a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44.tar.bz2
am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '8815d261d9fefbac8f24936dc37a055ab9ced038': Don't confuse stat and stat64.
Diffstat (limited to 'core/java/android/net/ProxyDataTracker.java')
0 files changed, 0 insertions, 0 deletions