1This project contains only the cpp/src files from upstream. To update: 2git merge aosp/upstream-master 3If upstream has changes outside the cpp/src directory (likely), it will get 4conflicts on the modified files. To drop the changes to the unmerged 5directories: 6git rm -rf data 7git rm -rf java 8git rm -rf cpp/data 9git rm -rf cpp/ext 10git rm -rf cpp/tools 11git commit 12 13 14# Local changes 15Fixed uninitialized variable. See bug 116114182 for details. 16