tree 093fd48d98caae187f37d336156d71d9fdfb2cdb
parent 58d0489b2493c34974821ce56f90372f5714d75b
parent ec5db43567d0240dfb74c9b5861107e16f95854f
author Justin Klaassen <justinklaassen@google.com> 1502349064 +0000
committer android-build-merger <android-build-merger@google.com> 1502349064 +0000

Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 3704bb0740
am: ec5db43567

Change-Id: I39be25f3cb506b47ffc7905f4700c5fa606dd0d8