tree c5b6f931bdc80fa1c55c2ff5ce2c5290110bf3eb
parent 7e08c7ec172d05feb140ab8ef427975531a1554b
parent 5a0cfda17e34abf84d7b1b47ff69d13305b1e805
author Ian Pedowitz <ijpedowitz@google.com> 1494905549 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494905553 +0000

Merge "Revert "Revert "Resource ID fixup.""" into oc-dev