Esteban Talavera 112f8d88fd Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev ...

am: 535533680f

Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628

2017-05-31 12:04:57 +00:00

..

app

Import translations. DO NOT MERGE

2017-04-28 19:46:17 -07:00

robotests

Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev

2017-05-31 11:58:39 +00:00

unit

Fix an override filter bug.

2017-05-25 14:23:29 -07:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00