am 85e4d515: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev
am 85e4d515: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev

* commit '85e4d515a7610207cde07521c05d12297117d6cf':
  Lock in final resource IDs.

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