testing QS
Merge branch 'jb-ras-mr2.0' of https://github.com/moongato/android_manifest into jb-ras-mr2.0