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 | dcb5f18fd6fac5d8048a11c60348bae82fbe739e (patch) | |
| tree | 81d9564733210ebcc9a52be50ccc3dcfb46820aa /graphics/java/android/renderscript/ProgramStore.java | |
| parent | 05bcf7553ee2c79331a6f5734f395f39b525c797 (diff) | |
| parent | 007ad7700a23ff7e618cfeee1eab97063c93b800 (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 'graphics/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions