Squashed commit of the following:

commit ccfee5ca255652892b407fa046a797bf62d3b1c3
Author: Alon Albert <aalbert@google.com>
Date:   Mon Feb 4 13:52:50 2013 -0800

    Add EVENT_COLOR's to Event Entity Iterator

    Bug: 8132457
    Change-Id: I292d10844bdeb21a2845a656dd0676b9acb8219e

commit 043587d3ef1a9cc156a6819fdcb7ef5b2aa81ed4
Author: Dianne Hackborn <hackbod@google.com>
Date:   Fri Jan 25 11:29:31 2013 -0800

    Protect calendar with app ops.

    Change-Id: I9d6705b0fa5257434a825809ad46d422f2ee57cc

commit 7a2531a4b68e9efe14353cc7f4a64a8c5613e5d3
Author: Alon Albert <aalbert@google.com>
Date:   Mon Dec 17 17:24:28 2012 -0800

    Put some useful information in User-Agent Header

    Put information in User-Agent:
    * Build fingerprint
    * Calendar or CalendarSyncAdapter package name + version code
    * Package name of app making changes to provider for uphill syncs

    Example:
    google/mantaray/manta:K/MASTER/eng.aalbert.20121217.140040:eng/dev-keys:com.google.android.calendar:201212060:com.google.android.calendar Google-HTTP-Java-Client/1.11.0-beta (gzip)

    Change-Id: I729c64ba9b922523d35903fcaf2a51cc234799a8

commit 746015647838dad7abeb7d0fc40ec49b722148ae
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 12 10:07:32 2012 -0800

    Import translations. DO NOT MERGE

    Change-Id: I7226fbe0f633f92a93feb148f9806eff46531135
    Auto-generated-cl: translation import

commit 7a0d5b82a70ee5734f869583e04514f4f36d793f
Merge: 78bd04e 49b7d3c
Author: Sara Ting <sarating@google.com>
Date:   Tue Oct 16 11:23:18 2012 -0700

    am 49b7d3c4: Fix race condition for missing alerts after boot up.

    * commit '49b7d3c4222a6b9e8e4639ba6d5128df5eac7e73':
      Fix race condition for missing alerts after boot up.

commit 78bd04e183a9d8d8c031cc4d1c9b66f718da7bce
Merge: 80c9f35 65dd538
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 14:57:30 2012 -0700

    am 65dd5386: (-s ours) am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '65dd538630d0961b7d732a27da02817186eb7d26':
      Fix event color query (which fixes the failing CTS test).

commit 80c9f359cd4024e47888562f2de2138cac823f0b
Merge: 864156f d2e4cb0
Author: Sara Ting <sarating@google.com>
Date:   Tue Oct 2 14:05:37 2012 -0700

    am d2e4cb09: am f4b1756f: Fix event color query (which fixes the failing CTS test).

    * commit 'd2e4cb09054364f1b09e453426f642961cfbf7cf':
      Fix event color query (which fixes the failing CTS test).

commit 864156f921fc1d49517cfc3e04a6a7b7a7c4eab2
Merge: 01ee180 b557005
Author: Sara Ting <sarating@google.com>
Date:   Fri Sep 28 00:33:47 2012 -0700

    am b5570054: Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev

    * commit 'b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad':
      Fix possible NPE in runScheduleNextAlarm.

commit 01ee1808cbacfec804f4058a3e6538203659fb6d
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 12:49:55 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: If1b588c7bf97f5115af499dda727be3c94cdf316
    Auto-generated-cl: translation import

Change-Id: I09709061ee6b28d934d7f5c1e9c7bb1559016e03