am: 82a8c5f246
* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
Revert "Finalize resource IDs for N."
Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
am: 82a8c5f246
* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
Revert "Finalize resource IDs for N."
Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd