am 5dfe6222: am 078717be: Merge "Disable on-device linking" into honeycomb
am 5dfe6222: am 078717be: Merge "Disable on-device linking" into honeycomb

* commit '5dfe6222d97d2403a892188eddf5560971d5270d':
  Disable on-device linking

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