OSDN Git Service

am 48e324f2: am 21640c4b: (-s ours) am de1d2252: The ICU data is no longer compiled...
authorJoe Onorato <joeo@android.com>
Fri, 16 Jul 2010 06:29:36 +0000 (23:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jul 2010 06:29:36 +0000 (23:29 -0700)
commit97ca97e409f9f5f9b59c81196f7611a0116ec114
tree303549b17bf6e2f4d10ed6e4c902ed357766ea7e
parent95b6f9eb6c3ccd0c016245a75ac02cc9ac6534d5
parent48e324f2396af7b49c21c09d8f6cf7a5d7d9eeb5
am 48e324f2: am 21640c4b: (-s ours) am de1d2252: The ICU data is no longer compiled directly into the shared library.

Merge commit '48e324f2396af7b49c21c09d8f6cf7a5d7d9eeb5' into dalvik-dev

* commit '48e324f2396af7b49c21c09d8f6cf7a5d7d9eeb5':