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