Commit 49247f6b authored by Jonathan Freed's avatar Jonathan Freed Committed by Commit Bot

Adding Change-Id to README to track the latest merge checkpoint.

Change-Id: Idd5ccd907c011112e1abe9255ad6a7e9ec6ad54a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1979141
Commit-Queue: Jonathan Freed <freedjm@chromium.org>
Reviewed-by: default avatarDan H <harringtond@chromium.org>
Auto-Submit: Jonathan Freed <freedjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727206}
parent 7d3b5f05
...@@ -9,8 +9,4 @@ implementations of classes to facilitate compiling out dependencies on ...@@ -9,8 +9,4 @@ implementations of classes to facilitate compiling out dependencies on
[//third_party/feed_library/](../../../third_party/feed_library/) and [//third_party/feed_library/](../../../third_party/feed_library/) and
[//components/feed/](../../../components/feed/) when the `enable_feed_in_chrome` [//components/feed/](../../../components/feed/) when the `enable_feed_in_chrome`
build flag is disabled. The public classes and methods in real/dummy used by build flag is disabled. The public classes and methods in real/dummy used by
[//chrome/android/java/](../java/) must have identical signatures. [//chrome/android/java/](../java/) must have identical signatures.
\ No newline at end of file
Library code and host API definitions can be found under
[//third_party/feed_library/](../../../third_party/feed_library/). More information about the
library is available in the [README.md](../../../third_party/feed_library/src/README.md).
# 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 Change-Id: I88bde10dbe068bec89b186097c262a89cf849689
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment