diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-12-10 07:48:35 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-12-10 07:48:35 -0800 |
| commit | b7db580e42d6512a7ee13a7450f5cd7907a10604 (patch) | |
| tree | 443dc987a0e83c3e1393d368f1d8d72e7457abc9 /preloaded-classes | |
| parent | 30cee478b79c960cc17b172f8620eaaaeef7cb7b (diff) | |
| parent | cd6e3484c5d8f27d4b870ecdb15b9e205c75bffc (diff) | |
| download | frameworks_base-b7db580e42d6512a7ee13a7450f5cd7907a10604.zip frameworks_base-b7db580e42d6512a7ee13a7450f5cd7907a10604.tar.gz frameworks_base-b7db580e42d6512a7ee13a7450f5cd7907a10604.tar.bz2 | |
resolved conflicts for merge of cd6e3484 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/preloaded-classes b/preloaded-classes index 1a92546..1791e39 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -221,6 +221,7 @@ android.net.NetworkConnectivityListener$State android.net.NetworkInfo android.net.NetworkInfo$DetailedState android.net.SSLCertificateSocketFactory +android.net.TrafficStats android.net.Uri android.net.Uri$1 android.net.Uri$AbstractHierarchicalUri |