Paranoid Android 6.0.2 Release 1

Bugfix release 2
Merge tag 'android-6.0.1_r22' into develop

Android 6.0.1 release 22
tree: 35e814122f7f961be5b685af8dcb4ecd3920ae94
  1. res/
  2. src/
  3. tests/
  4. proguard.flags