Christine Franks c350386476 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev ...

am: cb9a7075f8

Change-Id: I0b059d3c240169ff4b0cc24fd22597bd31659fe7

2017-07-21 19:05:42 +00:00

..

app

Import translations. DO NOT MERGE

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

robotests

Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev

2017-07-21 18:52:56 +00:00

unit

Fix Settings manifest pointing to old class namespace

2017-07-19 10:29:16 -04:00

Android.mk

…