am: 44b24c9b38
* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
Revert "Revert "Finalize resource IDs for N.""
Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
am: 44b24c9b38
* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
Revert "Revert "Finalize resource IDs for N.""
Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6