Alan Viverette 2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev ...

am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a

2017-04-14 16:33:14 +00:00

..

java

Merge "Update more implementations of findViewById()" into oc-dev

2017-04-14 16:33:14 +00:00

jni

Merge "Use provided style for fallback font selection" into oc-dev

2017-04-14 15:13:15 +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