tree 42558a5ec2cf883f1c95a328b82d4043f3b8a903
parent 447e93dffca4b957ee8abfc1e22eaf7b000c8e65
parent 82a8c5f24653baf98a77f050f14e7256e864cbf9
author Michael Wright <michaelwr@google.com> 1464385548 +0000
committer android-build-merger <android-build-merger@google.com> 1464385548 +0000

Merge "Revert "Finalize resource IDs for N."" into nyc-dev
am: 82a8c5f246

* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
  Revert "Finalize resource IDs for N."

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd