Bug 694334 - Minor touchups to 7f874fcc92c4: fix copy/pasted copyright block and expand glob imports to individual imports [r=lucasr]
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 14 Oct 2011 14:44:59 -0400
changeset 83186 175144e7afdfeacaab20092a3e6349f099ad18f2
parent 83185 5f287a7da2ec77bb8b555dfaef9eb6a17c02266c
child 83187 687bcbb451b31beff8b54183144f03e8cbe1a744
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr
bugs694334
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 694334 - Minor touchups to 7f874fcc92c4: fix copy/pasted copyright block and expand glob imports to individual imports [r=lucasr]
embedding/android/SessionHistory.java
--- a/embedding/android/SessionHistory.java
+++ b/embedding/android/SessionHistory.java
@@ -10,23 +10,21 @@
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is Mozilla Android code.
  *
  * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009-2010
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Vladimir Vukicevic <vladimir@pobox.com>
- *   Matt Brubeck <mbrubeck@mozilla.com>
- *   Vivien Nicolas <vnicolas@mozilla.com>
+ *   Brian Nicholson <bnichnolson@mozilla.com>
  *   Kartikaya Gupta <kgupta@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
@@ -37,17 +35,18 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 package org.mozilla.gecko;
 
 import java.util.Stack;
 
-import android.content.*;
+import android.content.ContentValues;
+import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 import android.util.Log;
 
 class SessionHistory
 {
     private final GeckoApp mApp;
     private final DatabaseHelper mDbHelper;