diff options
| author | Colin Cross <ccross@android.com> | 2016-12-06 12:39:27 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-12-06 12:54:07 -0800 |
| commit | 5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed (patch) | |
| tree | acbcc451ce1e1904be611a1c692ecb4529e704e7 /README.android | |
| parent | e39966631563bf0d6371ff6832acbc0ec203e64d (diff) | |
| parent | bbc9221f9f4247ef4e8af67e406d451d83fe118b (diff) | |
| download | sfntly-5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed.tar.gz | |
Merge commit 'bbc9221' into master
This merges the history from upstream without making any changes to
the code.
Change-Id: I303a906c2cb361cdc2b9a6c99da2b09782467254
Diffstat (limited to 'README.android')
| -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 |