summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-12-05 22:27:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-05 22:27:55 +0000
commit4f784483e40b587cefff4a056726f82fed0a30a8 (patch)
tree034e6460dc4fafec00ba2583198534eb49735996
parentea4095137562b4f98e42deb6e2d6c3e160f6bab8 (diff)
parentd194b7120ce19bf8fd18b65be7851865b7d88e9c (diff)
downloadgyp-4f784483e40b587cefff4a056726f82fed0a30a8.tar.gz
am d194b712: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.85
* commit 'd194b7120ce19bf8fd18b65be7851865b7d88e9c': Hack to make it compile, given that we're missing SkBitmapDevice.h
0 files changed, 0 insertions, 0 deletions