tree 6c880bf6fbe8b32550569a3f8e39506dd80d9c37
parent bf932b006743e25e50f5e493b011e520141536d1
parent 9ed5eefc28f8193840b3186c612352930f7dad52
author Akshay Thakker <aksh@google.com> 1464385285 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464385286 +0000

Merge "Revert "Finalize resource IDs for N."" into nyc-dev