From e873bfc7b5d9ba69411bd39f69660c9c7929f858 Mon Sep 17 00:00:00 2001 From: Robert Ginda Date: Wed, 20 Jan 2016 16:18:49 -0800 Subject: Add automerge info to README.md Change-Id: I6bfcc5465798a1f805cd4e2e4fa98d1be1559ff0 (cherry picked from commit e5b6c78c4dbe16e48efa4df02471a7969266696b) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 450b1c4..5a6735f 100644 --- a/README.md +++ b/README.md @@ -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. -- cgit v1.2.3