| commit | aa0bfd1390a437020d2bc80ebb22a7a65f2c5c76 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Thu Jul 15 11:36:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:36:56 2010 -0700 |
| tree | dbbc1d184e52f3733ca074c57d381dfa604a2674 | |
| parent | 06a62bfda6aa4919d92a505ede4c8cd247fe15ba [diff] | |
| parent | 3533ac4b1edc4e863385a0f29c83cfbf49142924 [diff] |
am 3533ac4b: Resolved conflicts for merge of de1d2252 to master Merge commit '3533ac4b1edc4e863385a0f29c83cfbf49142924' into dalvik-dev * commit '3533ac4b1edc4e863385a0f29c83cfbf49142924': The ICU data is no longer compiled directly into the shared library.