Jorim Jaggi 27af670d9a Merge "Implement new splash screen API" into oc-dev ...

am: 46ae660bf2

Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8

2017-04-14 12:02:08 +00:00

..

assets

…

res

Merge "Implement new splash screen API" into oc-dev

2017-04-14 12:02:08 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Service for OEM lock management." into oc-dev

2017-04-14 11:43:03 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…