commit cd0f6e0cd5ab3271897064b28cecc50c0a481ca8
author Baligh Uddin <baligh@google.com> Fri Feb 14 20:54:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:54:38 2014 +0000
tree b9221af250cffb377475a64263ff9a9a5f4379e1
parent 0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c
parent 6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959

am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959':
  Import translations. DO NOT MERGE

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 2a5ed69..2665430 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -189,7 +189,7 @@
             Log.e(TAG, "launcher backup has failed", e);
         }
 
-        out.key = keys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = keys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onBackup: wrote " + out.bytes + "b in " + out.rows + " rows.");
     }
@@ -261,7 +261,7 @@
         // will catch any changes the restore process might have made
         Journal out = new Journal();
         out.t = 0;
-        out.key = mKeys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = mKeys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onRestore: read " + mKeys.size() + " rows");
         mKeys.clear();