tree 0f0dbbcb0b1da15fc40dd0ccd17d12536082ab8f
parent 8d947520c394575aa9ff71e5c646f54e8e55b097
author Michael Wright <michaelwr@google.com> 1467211636 +0100
committer Michael Wright <michaelwr@google.com> 1467380566 +0100

N MR1 is API 25

Also, finalize resource IDs for N MR1

Bug: 29816674
Change-Id: Ie880adb2544f4e2e32b439fe975a68a3928e6fe5