Evan Laird bc562b1888 Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev ...

am: a9e2d97004

Change-Id: I891ad549056df8632fd10570769c2695f6ad4384

2017-07-20 20:42:46 +00:00

..

app

Import translations. DO NOT MERGE

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

robotests

Merge "Zen priority settings update" into oc-dr1-dev

2017-07-20 14:19:33 +00:00

unit

Fix Settings manifest pointing to old class namespace

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

Android.mk

…