Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
am: e99586cfea
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3
This commit is contained in:
a9e2d97004
am: e99586cfea
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3