Google Git
Sign in
android / platform / external / chromium_org / e1049c797e39f4f9f9753731b3c7054473db1b45
commite1049c797e39f4f9f9753731b3c7054473db1b45[log] [tgz]
authorBo Liu <boliu@google.com>Sat Nov 09 18:02:16 2013 -0800
committerBo Liu <boliu@google.com>Sat Nov 09 18:20:17 2013 -0800
treee23c23c295b5a89b27ed3facea7d158e16a3a8f4
parent91e7787fa5338fc0eeb6cbf0c504d4dc187b16ce [diff]
Fix incorrect resolving of merge conflict causing graphics corruption

This block of code is accidentally deleted when cherry-picking and
resolving merge conflicts for crrev.com/r230093.

The commit with this mistake is 294545aa54ddff00ccb2f1188f231ff0ebbd9386

BUG: 11611953
Change-Id: I1f98ca2afd825b9cb8dc05549dddb55bb9c99297
1 file changed
tree: e23c23c295b5a89b27ed3facea7d158e16a3a8f4
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. cc/
  7. chrome/
  8. chrome_frame/
  9. chromeos/
  10. cloud_print/
  11. components/
  12. content/
  13. courgette/
  14. crypto/
  15. dbus/
  16. device/
  17. extensions/
  18. google_apis/
  19. google_update/
  20. gpu/
  21. ios/
  22. ipc/
  23. jingle/
  24. media/
  25. native_client_sdk/
  26. net/
  27. ppapi/
  28. printing/
  29. remoting/
  30. rlz/
  31. sandbox/
  32. sdch/
  33. skia/
  34. sql/
  35. sync/
  36. testing/
  37. third_party/
  38. tools/
  39. ui/
  40. url/
  41. webkit/
  42. win8/
  43. .DEPS.git
  44. .gitignore
  45. .gitmodules
  46. .gn
  47. .merged-revisions
  48. Android.mk
  49. AUTHORS
  50. codereview.settings
  51. DEPS
  52. GypAndroid.darwin-arm.mk
  53. GypAndroid.darwin-mips.mk
  54. GypAndroid.darwin-x86.mk
  55. GypAndroid.linux-arm.mk
  56. GypAndroid.linux-mips.mk
  57. GypAndroid.linux-x86.mk
  58. LICENSE
  59. LICENSE.chromium_os
  60. NOTICE
  61. OWNERS
  62. PRESUBMIT.py
  63. PRESUBMIT_test.py
  64. WATCHLISTS