Vikas Marwaha 8b5315f588 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b ...

am: 358ec57382

Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9

2017-04-14 18:36:10 +00:00

..

java

Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b

2017-04-14 18:36:10 +00:00

jni

Merge "Use provided style for fallback font selection" into oc-dev am: 43112fd26e

2017-04-14 18:09:55 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

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

2017-04-14 18:01:24 +00:00

tests

Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b

2017-04-14 18:25:53 +00:00