| commit | 075ff6c88f52c984712355843fc072ab113aab74 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 15:14:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 15:14:39 2013 -0700 |
| tree | c3968250c7c1d73e36b2d37843c17bd0b577fb51 | |
| parent | cfbc8607ceccad1f452f9f0428cdf634b3ca92a2 [diff] | |
| parent | e3fd2a237fd9f9f9bed7a0e34008d30b8c20e4e3 [diff] |
am e3fd2a23: (-s ours) Reconcile with klp-release - do not merge * commit 'e3fd2a237fd9f9f9bed7a0e34008d30b8c20e4e3': More Charset test fixes. Work around icu4c causing canEncode to always return true for surrogates. Fix CharsetTest for SCSU and Shift_JIS. Fix AIOOBE in Method.compareParameters. Fix sign-extension of type indices. Show size/alloc/free per Dalvik heap space in dumpsys Merge "Fix DateIntervalFormat to take time zone into account." NativeCrypto: check that npnProtocols != NULL