am aa2fe148: merge from open-source master

Browse Source

Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken

* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
  Improved error handling when font loading fails.

...

This commit is contained in:

The Android Open Source Project

2010-05-19 08:21:54 -07:00

committed by Android Git Automerger

parent 984680baff aa2fe14849

commit 0b6defefb9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available