Ajay Nadathur 3d627974d6 Merge "Do not show options if screen lock types is empty" into oc-dr1-dev ...

am: 0bde6dcb18

Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d

2017-07-12 18:04:26 +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

2017-07-12 17:53:07 +00:00

unit

Fix filter bug for non-internal app filtering.

2017-07-11 17:11:28 -07:00

Android.mk

Change build targets for settings tests

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