Christine Franks d974ccb625 Merge "Allow FR in carrier demo mode" into oc-dev ...

am: 9ef166a578

Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992

2017-05-31 22:52:57 +00:00

..

app

Import translations. DO NOT MERGE

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

robotests

Allow FR in carrier demo mode

2017-05-31 12:04:01 -07:00

unit

Consistent "low storage" behavior.

2017-05-30 23:51:06 -06:00

Android.mk

Change build targets for settings tests

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