update
update
update
Merge branch 'master' of https://github.com/jazzlly/Notes

Conflicts:
	android/android.audio.system/4.2/flow/audio.policy.init.cpp