OSDN Git Service

Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
authorJohn Reck <jreck@google.com>
Thu, 12 May 2011 23:29:48 +0000 (16:29 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2011 23:29:48 +0000 (16:29 -0700)
commit58348114645f3987aaabae40612a876cfd2bc678
tree07f7fec51f6721e09fc3e7565ebbf11d2c78d449
parentc74d30ac1079750a0d7f87704a9962f8045cce94
parent714b8a5696d6c82268757bc6eb711eddbabc872e
Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
WebCore/platform/graphics/android/BaseLayerAndroid.cpp
WebKit/android/nav/WebView.cpp