Ajay Nadathur 00dda696cd Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18 ...

am: 3d627974d6

Change-Id: Ib062bcdfc23008dab14622e4741fca6dc30e5950

2017-07-12 18:11:47 +00:00

..

app

Import translations. DO NOT MERGE

2017-07-10 16:23:41 -07:00

robotests

Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18

2017-07-12 18:11:47 +00:00

unit

Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am: bce83f8c71

2017-07-12 17:33:32 +00:00

Android.mk

Change build targets for settings tests

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