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

* commit 'bc463ea1c5fa9c80fa06183a82fdd1acfb5289e5':
  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