| Colin Cross | bcf61c4 | 2017-04-07 10:46:45 -0700 | [diff] [blame] | 1 | This project contains only the cpp/src files from upstream. To update: |
| 2 | git merge aosp/upstream-master |
| 3 | If upstream has changes outside the cpp/src directory (likely), it will get |
| 4 | conflicts on the modified files. To drop the changes to the unmerged |
| 5 | directories: |
| 6 | git rm -rf data |
| 7 | git rm -rf java |
| 8 | git rm -rf cpp/data |
| 9 | git rm -rf cpp/ext |
| 10 | git rm -rf cpp/tools |
| 11 | git commit |
| Haibo Huang | 8b698fd | 2019-05-06 12:43:47 -0700 | [diff] [blame] | 12 | |
| 13 | |
| 14 | # Local changes |
| 15 | Fixed uninitialized variable. See bug 116114182 for details. |