OSDN Git Service

am bfae30c4: am 2284a1c0: Merge "Remove global Skia includes and associated shortcuts."
authorDerek Sollenberger <djsollen@google.com>
Mon, 12 May 2014 23:28:03 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:03 +0000 (23:28 +0000)
commit8255187bd2b463dc4982636c4c41485b278c6935
treedb34eca2da5ec1662b262862fc44c323209fcb14
parentc8ce9964ac5bcd563f656c0caf3deab1fc5f6a12
parentbfae30c4e5ee0c7f5afe5fb5b05ade8c87abc2d5
am bfae30c4: am 2284a1c0: Merge "Remove global Skia includes and associated shortcuts."

* commit 'bfae30c4e5ee0c7f5afe5fb5b05ade8c87abc2d5':