diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 02:51:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 02:51:28 +0000 |
| commit | 90e121df2741a3e4eb6a78da1d39c299c5a2eca9 (patch) | |
| tree | eb7e819860483b859bca010ee9b2f0b903a9f80f | |
| parent | fa7aae3642754610576328469c6afc68740cec5e (diff) | |
| parent | d66cd7275a614b6e836b9972dde700c3b82c319c (diff) | |
| download | sfntly-90e121df2741a3e4eb6a78da1d39c299c5a2eca9.tar.gz | |
Merge commit 'bbc9221' into master am: d4aea7c865
am: d66cd7275a
Change-Id: I8a738d1a806875e344d0bc10e1015ea446ae7fe0
| -rw-r--r-- | README.android | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/README.android b/README.android index e99dcf1..4447b27 100644 --- a/README.android +++ b/README.android @@ -1,2 +1,11 @@ -Current version: -svn checkout http://sfntly.googlecode.com/svn/trunk/cpp/src@134 cpp/src +This project contains only the cpp/src files from upstream. To update: +git merge aosp/upstream-master +If upstream has changes outside the cpp/src directory (likely), it will get +conflicts on the modified files. To drop the changes to the unmerged +directories: +git rm -rf data +git rm -rf java +git rm -rf cpp/data +git rm -rf cpp/ext +git rm -rf cpp/tools +git commit |