diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 04:00:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 04:00:03 +0000 |
| commit | c3008dfeee08a020e6329a82761ffe47cd03bc2c (patch) | |
| tree | a71aee837870db9d66bde7226ae2393c190b794d | |
| parent | 61657b2d87b88576ab1b7d7fb5768b0e315c9216 (diff) | |
| parent | 81c126c6c590699cab67fe2c8814478b5c3a0061 (diff) | |
| download | sfntly-c3008dfeee08a020e6329a82761ffe47cd03bc2c.tar.gz | |
Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: 90e121df27 am: 9e1ecbca64 am: ccb3219886 am: ca3f521449 am: 2ce18b7c4a am: 06d7d9f007 am: 84e59f094e am: 4a6d4ae2f6 am: 1f84dc796f am: 06d185e1fc am: 645381723c
am: 81c126c6c5
Change-Id: I47d7f6021472b084b247264fd850a54c2be67a67
| -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 |