OSDN Git Service

am 183f97b7: am 1c12f9e7: malloc some advances
authorVictoria Lease <violets@google.com>
Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances

1  2 
core/jni/android/graphics/Paint.cpp

Simple merge