diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 02:56:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 02:56:58 +0000 |
| commit | 9e1ecbca64ce4fc834d032b4d99c8ed1cd79db75 (patch) | |
| tree | 9e6a4f9cce75a5de89b0f3907cb2733e485467a9 | |
| parent | 6723e5241a45c6de224c96384a595a1bf5bc5449 (diff) | |
| parent | 90e121df2741a3e4eb6a78da1d39c299c5a2eca9 (diff) | |
| download | sfntly-9e1ecbca64ce4fc834d032b4d99c8ed1cd79db75.tar.gz | |
Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a
am: 90e121df27
Change-Id: Ia7528e93222c0068009b5e6109e66bc4733cba8c
| -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 |