blob: ec7052f9007d0c812decf7217cc4d4ede5b16416 [file] [view]
# Manual Merges
[Piet code](https://cs.chromium.org/chromium/src/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/)
and [feed wire protos](https://cs.chromium.org/chromium/src/components/feed/core/proto/wire/)
are hand-merged from https://chromium.googlesource.com/feed regularly.
Last merged commit ID: aa5e906377aaec1263ec77fe66c0e069217af54d