diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-18 13:39:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:39:15 -0700 |
| commit | 03805f729cacead5d0797c840430ea99b26036d6 (patch) | |
| tree | 144052dd035ca793f287e6acbf4df0ef7e5cd7cf /api/9.xml | |
| parent | a2527055f8e3106fe70feeee10ae0c4ddc6596e9 (diff) | |
| parent | d313cab46e07c40f4cd1a94304a553e7eb809190 (diff) | |
| download | frameworks_base-03805f729cacead5d0797c840430ea99b26036d6.zip frameworks_base-03805f729cacead5d0797c840430ea99b26036d6.tar.gz frameworks_base-03805f729cacead5d0797c840430ea99b26036d6.tar.bz2 | |
am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp
* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
tracking merge of external/apache-http from dalvik-dev
Diffstat (limited to 'api/9.xml')
| -rw-r--r-- | api/9.xml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -379555,7 +379555,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""100-Continue"" + value=""100-continue"" static="true" final="true" deprecated="not deprecated" |