OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30238da 1c03f55)
am aa2fe148: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:21:54 +0000 (08:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 May 2010 15:21:54 +0000 (08:21 -0700)
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken

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


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help