Salvador Martinez 42e65d11b9 Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83 ...

am: 96e4b8f9f4

Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405

2017-07-12 20:49:51 +00:00

..

app

Import translations. DO NOT MERGE

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

robotests

Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83

2017-07-12 20:49:51 +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