tree c64b974c6f750b40ba7b79096c812e6fb0db0e5e
parent 2a45221faca38f4ded9f87ed10b339db22f54d26
parent f4d873fd56308dc4166baeacbf92d508b59a7248
author Maurice Lam <yukl@google.com> 1500131384 +0000
committer android-build-merger <android-build-merger@google.com> 1500131384 +0000

Merge "Load internal resources using name rather than ID" into oc-dr1-dev am: 43e249ff27
am: f4d873fd56

Change-Id: If4b688989d8f7c0da73e32a98a9ebba619c53397