tree bd0c1cd6b9f84f84290ad8e2cc4483a40cd2eee9
parent 5d350d4864cfcaef294ab8e3b022e6de0a37d05b
parent 0d25fdd4a8901626d5c0bfe863b8e75fb309b34b
author Adam Lesinski <adamlesinski@google.com> 1465444436 +0000
committer android-build-merger <android-build-merger@google.com> 1465444436 +0000

Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: I156c373b858e99b892c66f941005409097937714