Git合入AOSP的Patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

                                                 #打Google patch 的正确姿势

//如果顺利，没有任何提示

git am --directory=LINUX/android/frameworks/av 9ad03116.diff

//遇到冲突，换成传统方式 patch -p no. < XXX.diff

patch -p1 -i 9ad03116.diff

//查看patch 生成的冲突

cat media/libstagefright/MPEG4Extractor.cpp.rej

//查看文件的状态

git status

//手动修改

vim MPEG4Extractor.cpp

//解决冲突后运用这个patch

git apply 9ad03116.diff

//告诉git老人家，冲突我已经解决了

git am --resolved

//查看log，你会看到已经有提交记录了

git log

//如果提交信息不对，自己再修改

git commit --amend

//patch合并完毕，大功告成

git push origin HEAD:refs/for/s_baseline

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++