tree 810f69824cc44495c46a90eb53d93bd65efc47de
parent b5ff2116acd9871192aba63e54d09390a2b8da3c
parent 97afc8f560be0b0e2e78e1d966365263ab643a72
author DongseokYi <tobitoba@gmail.com> 1284678413 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284678413 -0700

am 97afc8f5: am 7315af87: Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd.

Merge commit '97afc8f560be0b0e2e78e1d966365263ab643a72' into gingerbread-plus-aosp

* commit '97afc8f560be0b0e2e78e1d966365263ab643a72':
  Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd.