OSDN Git Service

am a4d0a67e: Merge change Ifb0a0398 into eclair-mr2
authorKen Shirriff <kens@google.com>
Wed, 9 Dec 2009 23:51:42 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Dec 2009 23:51:42 +0000 (15:51 -0800)
commitcd6e3484c5d8f27d4b870ecdb15b9e205c75bffc
treeacde3d6f675fe4ccdfb9436f4e1316d4b38b0200
parent5cd6fcd518d47d1974a10fccf3c3d5431a83307a
parenta4d0a67ed02c56dceaae01f328381b280d8fc1b7
am a4d0a67e: Merge change Ifb0a0398 into eclair-mr2

Merge commit 'a4d0a67ed02c56dceaae01f328381b280d8fc1b7' into eclair-mr2-plus-aosp

* commit 'a4d0a67ed02c56dceaae01f328381b280d8fc1b7':
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.
preloaded-classes