Hugo Benichi e90070d528 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a ...

am: 4d47a6a26b

Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475

2017-04-13 13:52:21 +00:00

..

java

Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a

2017-04-13 13:52:21 +00:00

jni

Merge "Binder: Be forceful about a forceful exit." into oc-dev

2017-04-13 08:16:49 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev

2017-04-13 07:53:39 +00:00

tests

Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev

2017-04-13 13:27:57 +00:00