diff options
author | Brian Carlstrom <bdc@google.com> | 2010-08-18 14:22:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 14:22:08 -0700 |
commit | bb1562e559f63783ba5bc426567e4a19c3731ac5 (patch) | |
tree | a33e9c66b0b726047894e3cd7737f9385f8b6555 /api/9.xml | |
parent | 24844c9a30cf20467cd19d28f2e74de74c9c3622 (diff) | |
parent | 03805f729cacead5d0797c840430ea99b26036d6 (diff) | |
download | frameworks_base-bb1562e559f63783ba5bc426567e4a19c3731ac5.zip frameworks_base-bb1562e559f63783ba5bc426567e4a19c3731ac5.tar.gz frameworks_base-bb1562e559f63783ba5bc426567e4a19c3731ac5.tar.bz2 |
am 03805f72: am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit '03805f729cacead5d0797c840430ea99b26036d6'
* commit '03805f729cacead5d0797c840430ea99b26036d6':
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
@@ -379322,7 +379322,7 @@ type="java.lang.String" transient="false" volatile="false" - value=""100-Continue"" + value=""100-continue"" static="true" final="true" deprecated="not deprecated" |