Salvador Martinez 96e4b8f9f4 Merge "Fix mistake in conditional + test" into oc-dr1-dev ...

am: ab2d96de83

Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea

2017-07-12 20:47:14 +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

2017-07-12 20:41:27 +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