diff options
| author | Ken Shirriff <kens@google.com> | 2009-12-09 15:51:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:51:42 -0800 |
| commit | cd6e3484c5d8f27d4b870ecdb15b9e205c75bffc (patch) | |
| tree | acde3d6f675fe4ccdfb9436f4e1316d4b38b0200 /preloaded-classes | |
| parent | 5cd6fcd518d47d1974a10fccf3c3d5431a83307a (diff) | |
| parent | a4d0a67ed02c56dceaae01f328381b280d8fc1b7 (diff) | |
| download | frameworks_base-cd6e3484c5d8f27d4b870ecdb15b9e205c75bffc.zip frameworks_base-cd6e3484c5d8f27d4b870ecdb15b9e205c75bffc.tar.gz frameworks_base-cd6e3484c5d8f27d4b870ecdb15b9e205c75bffc.tar.bz2 | |
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.
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/preloaded-classes b/preloaded-classes index ae527ee..dc5327e 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -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 |