diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 03:14:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 03:14:30 +0000 |
| commit | 2ce18b7c4a6cacd7b6311b3f0c17bf1e964a888c (patch) | |
| tree | 7bb755f32615d4007a647da7bc9969eac307d0f9 | |
| parent | a01a58c85ae6f0b1fe97e4a383bb7536285264d8 (diff) | |
| parent | ca3f521449152babc87f22369c82bc56ca97b4ce (diff) | |
| download | sfntly-2ce18b7c4a6cacd7b6311b3f0c17bf1e964a888c.tar.gz | |
Merge commit 'bbc9221' into master am: d4aea7c865 am: d66cd7275a am: 90e121df27 am: 9e1ecbca64 am: ccb3219886
am: ca3f521449
Change-Id: Ie745f9c486932b2746e82f7a26d5023a61d518e6
| -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 |