diff options
| author | Robert Ginda <rginda@google.com> | 2016-01-20 16:18:49 -0800 |
|---|---|---|
| committer | Robert Ginda <rginda@google.com> | 2016-01-21 00:34:38 +0000 |
| commit | e873bfc7b5d9ba69411bd39f69660c9c7929f858 (patch) | |
| tree | aec7a9eed0acbc25e07365e8a9dfd2e476cf7eda | |
| parent | 0a3d9f85acbfefead48c5ba72157da79408ecca3 (diff) | |
| download | weave-common-upstream-master.tar.gz | |
Add automerge info to README.mdupstream-master
Change-Id: I6bfcc5465798a1f805cd4e2e4fa98d1be1559ff0
(cherry picked from commit e5b6c78c4dbe16e48efa4df02471a7969266696b)
| -rw-r--r-- | README.md | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2,3 +2,7 @@ This repository will contain code common to Weave, uWeave, and the Android and iOS clients. + +Changes merged into the aosp-master branch will be automatically cherry picked +into https://android.googlesource.com/platform/external/weave-common/ and from +there automerged with the same configuration as external/libweave. |