OSDN Git Service

am 6ff93d48: (-s ours) am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI...
authorTom Hudson <tomhudson@google.com>
Thu, 27 Aug 2015 07:02:20 +0000 (07:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:02:20 +0000 (07:02 +0000)
* commit '6ff93d486ca383331b69320c2d6a09e395c65367':


Trivial merge