resolve merge conflicts of b0c58aa to master

Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
2016-04-20 17:56:12 -07:00
parent 1e3cc4a35d b0c58aa530
commit 2524686c66
3 changed files with 14 additions and 1 deletions
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -25,5 +25,4 @@ public final class FeatureFactoryImpl extends FeatureFactory {
    public SupportFeatureProvider getSupportFeatureProvider() {
        return null;
    }
-
 }