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

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