am d04c6d19: resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp

* commit 'd04c6d19a589a2a0f60650675438c59ac6900f45': Cherry-pick system theme rebase to fix square UI on round watches
2015-09-14 21:24:53 +00:00
parent 96d9953f74 d04c6d19a5
commit 03f46af3e1
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1327,4 +1327,4 @@ public final class SystemServer {
        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, name);
        Slog.i(TAG, name);
    }
-}
+}