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

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