Abodunrinwa Toki 372fe83c2c Merge "SmartSelection: Use downloaded model file." into oc-dev am: a97608caa8 ...

am: 3b75e31ca6

Change-Id: I99187226c63184d6ae8e3b0732f3127262c40fe6

2017-04-27 14:05:48 +00:00

..

java

Merge "SmartSelection: Use downloaded model file." into oc-dev am: a97608caa8

2017-04-27 14:05:48 +00:00

jni

resolve merge conflicts of 01f050f21f to oc-dev-plus-aosp

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

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

Merge "Autofill binding permission fixes." into oc-dev am: d915c42150

2017-04-27 05:21:36 +00:00

tests

Fix BackupSettingsTest (update blacklist)

2017-04-27 11:19:07 +01:00