am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev
am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev

* commit 'e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
  Fix issue #8032572: Android app permission help text "null"...

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base