diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-03 16:25:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-03 16:25:15 -0700 |
| commit | 439dcb36ed2ce1c485b2c13a5c1ca4b120e18924 (patch) | |
| tree | ed855078c90054b870b6effb1b1ea9f82f1fb200 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c95afe73fdb66ded0580915713f749ebcf80ed0a (diff) | |
| parent | 0fb44af85530c1617ad19a890386341d8f61d33d (diff) | |
am 007ad770: merge from open-source master
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken
* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
Adapt to new location of libcore
Parse custom text header and ignore it.
Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
'uses-library' was not working for persistent applications.
Fix an NPE in InputMethodService when mExtractAction is null.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions