diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-02 08:00:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-02 08:00:00 -0800 |
commit | afe4eb88f1f4ace85dbf386c17a5f40bc1b8c16d (patch) | |
tree | 6510be768788bfe613b3061b1dbda0b848378b74 | |
parent | 20ab88413000fcc8668eeab25d9cb714097d0c45 (diff) | |
parent | 7c7e565346f81c8070c42f09267f921a83bc5e5b (diff) | |
download | external_skia-afe4eb88f1f4ace85dbf386c17a5f40bc1b8c16d.zip external_skia-afe4eb88f1f4ace85dbf386c17a5f40bc1b8c16d.tar.gz external_skia-afe4eb88f1f4ace85dbf386c17a5f40bc1b8c16d.tar.bz2 |
am 7c7e5653: Merge from open-source master
* commit '7c7e565346f81c8070c42f09267f921a83bc5e5b':
Fix compilation errors:
0 files changed, 0 insertions, 0 deletions