| commit | 4ee7e49544fed00637da78e11b2a6aa8603ffded | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 08:21:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 08:21:54 2010 -0700 |
| tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
| parent | 30238da1f5ff68a264c9980c9d45ffba10424ee2 [diff] | |
| parent | 1c03f554f113459ef6b62b56b84f99d2c9cc397b [diff] |
am aa2fe148: merge from open-source master Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken * commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934': Improved error handling when font loading fails.