Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd6e3484 authored by Ken Shirriff's avatar Ken Shirriff Committed by Android Git Automerger
Browse files

am a4d0a67e: Merge change Ifb0a0398 into eclair-mr2 

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

* commit 'a4d0a67e':
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.
parents 5cd6fcd5 a4d0a67e

preloaded-classes

+1 −1
Original line number Diff line number Diff line
@@ -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