tree 69ce02f918806905fe42f158b6dd55e39fc27163
parent 10e29e0730c21cb8a2cfe74b43792fa3a5705195
parent c38a20337658845b22e9faaaaf3b30f4884b081c
author Wang Xiaolei <wxiaolei@google.com> 1464977295 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464977301 +0000

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