Merge commit 'korg/cupcake'
[android/platform/packages/apps/Calendar.git] / MODULE_LICENSE_APACHE2