Google Git
Sign in
chromium / chromium / src / de8d63e50825ea1f9bb50815db2399a438c8e03d
commitde8d63e50825ea1f9bb50815db2399a438c8e03d[log] [tgz]
authorAleks Totic <atotic@chromium.org>Wed Sep 13 10:47:28 2017
committerCommit Bot <commit-bot@chromium.org>Wed Sep 13 10:47:28 2017
treea1431ac5fbe70af48e208a4d0f85e7bbf74d70a7
parent55bacf13d9c8991bca74c1f434dfe73a4afb351e [diff]
OOF conflict resolution is logical, not physical

Bug: 740993
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I88f2d778c7f0351daf6165fefc0c8654f209dca7
Reviewed-on: https://chromium-review.googlesource.com/663426
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Aleks Totic <atotic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501590}
3 files changed
tree: a1431ac5fbe70af48e208a4d0f85e7bbf74d70a7
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. blink/
  6. breakpad/
  7. build/
  8. build_overrides/
  9. cc/
  10. chrome/
  11. chrome_elf/
  12. chromecast/
  13. chromeos/
  14. cloud_print/
  15. components/
  16. content/
  17. courgette/
  18. crypto/
  19. dbus/
  20. device/
  21. docs/
  22. extensions/
  23. gin/
  24. google_apis/
  25. google_update/
  26. gpu/
  27. headless/
  28. infra/
  29. ios/
  30. ipc/
  31. jingle/
  32. mash/
  33. media/
  34. mojo/
  35. native_client_sdk/
  36. net/
  37. pdf/
  38. ppapi/
  39. printing/
  40. remoting/
  41. rlz/
  42. sandbox/
  43. sdch/
  44. services/
  45. skia/
  46. sql/
  47. storage/
  48. styleguide/
  49. testing/
  50. third_party/
  51. tools/
  52. ui/
  53. url/
  54. .clang-format
  55. .eslintrc.js
  56. .git-blame-ignore-revs
  57. .gitattributes
  58. .gitignore
  59. .gn
  60. .vpython
  61. AUTHORS
  62. BUILD.gn
  63. CODE_OF_CONDUCT.md
  64. codereview.settings
  65. DEPS
  66. ENG_REVIEW_OWNERS
  67. LICENSE
  68. LICENSE.chromium_os
  69. OWNERS
  70. PRESUBMIT.py
  71. PRESUBMIT_test.py
  72. PRESUBMIT_test_mocks.py
  73. README.md
  74. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .