summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-04-08 14:48:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-08 14:48:50 -0700
commit02b338b7f2919e4005a8e53ab39b67a24eedd270 (patch)
tree229295aefabe8d17b5109d8d6707cb3d028b92a4
parent7f22a7ccd1d2b982fe5f3513c2dab06609291194 (diff)
parentefdccf3ebbbed998207cd934638e8121b0508e1c (diff)
downloadframeworks_native-02b338b7f2919e4005a8e53ab39b67a24eedd270.zip
frameworks_native-02b338b7f2919e4005a8e53ab39b67a24eedd270.tar.gz
frameworks_native-02b338b7f2919e4005a8e53ab39b67a24eedd270.tar.bz2
am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp * commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b': Change TrafficStats to a new JNI implementation.
0 files changed, 0 insertions, 0 deletions