Dianne Hackborn 52a29573ee Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542 ...

am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f

2017-04-14 16:48:32 +00:00

..

java

Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542

2017-04-14 16:48:32 +00:00

jni

Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e

2017-04-14 15:31:25 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d

2017-04-14 16:12:49 +00:00

tests

Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a

2017-04-14 16:11:50 +00:00