add QA details
Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project

Conflicts:
app/src/main/AndroidManifest.xml
app/src/main/res/values/strings.xml
Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml