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.
This commit is contained in:
Ken Shirriff
2009-12-09 15:51:42 -08:00
committed by Android Git Automerger

View File

@@ -435,6 +435,7 @@ android.net.NetworkInfo
android.net.NetworkInfo$DetailedState
android.net.NetworkInfo$State
android.net.NetworkUtils
android.net.TrafficStats
android.net.Uri
android.net.Uri$HierarchicalUri
android.net.Uri$OpaqueUri
@@ -515,7 +516,6 @@ android.os.IVibratorService$Stub
android.os.Looper
android.os.MemoryFile
android.os.Message
android.os.NetStat
android.os.Parcel
android.os.Parcel$1
android.os.ParcelFileDescriptor