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

..

java

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

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

jni

Merge "Add Java API for libvintf." into oc-dev

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

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

2017-04-12 07:00:51 -07:00

res

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

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

tests

Merge "Add Java API for libvintf." into oc-dev

2017-04-14 04:13:04 +00:00