Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1a0717 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I6430912f into eclair-mr2 

* changes:
  New constants for db upgrade.
parents 7d2fd650 742f9cbd

core/java/android/provider/Im.java

+7 −1
Original line number Diff line number Diff line
@@ -947,6 +947,12 @@ public class Im { 
         * <P>Type: INTEGER</P>

         */

        String DISPLAY_SENT_TIME = "show_ts";



        /*

         * For rows which have been consolidated this is the row id of the

         * row into which they have been consolidated.

         */

        String CONSOLIDATION_KEY = "consolidation_key";

    }



    /**