OSDN Git Service

am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev
authorRaph Levien <raph@google.com>
Wed, 4 Jun 2014 18:44:32 +0000 (18:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 18:44:32 +0000 (18:44 +0000)
* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
  Better Minikin integration

1  2 
core/jni/android/graphics/Canvas.cpp
core/jni/android_view_GLES20Canvas.cpp

Simple merge