am d6c7d6a7: am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
am d6c7d6a7: am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs

* commit 'd6c7d6a7e33da6f182ff138227fecc924b3c6e21':
  add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81

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