diff options
| author | Colin Cross <ccross@android.com> | 2016-12-07 19:10:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 19:10:42 +0000 |
| commit | 58c17bcaf5ba933aa029425bab385c63e2049000 (patch) | |
| tree | acbcc451ce1e1904be611a1c692ecb4529e704e7 | |
| parent | eadbe7f20f2a48c9a1fdf013afc9bcbaebd18d23 (diff) | |
| parent | 126d7d22ee02ce1d1b3c5038f3624a75dc690a5a (diff) | |
| download | sfntly-58c17bcaf5ba933aa029425bab385c63e2049000.tar.gz | |
Merge commit 'bbc9221' into master am: 5e48fb0cc4
am: 126d7d22ee
Change-Id: Ie237ad22643882c284eb9c7201aba6f04b94de50
| -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 |