merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ife432dd46cf79868d756070fffa7c8f7db9bf1dd
Import translations. DO NOT MERGE

Change-Id: I753684fc5ce8bbfbda755ddda52ce6a7cfb97d73
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I0af22252f0aa654ebda0424eeda994a50345b08e
Auto-generated-cl: translation import
am 57153052: Import translations. DO NOT MERGE

* commit '57153052e77b7b97a3c013bf2fe46565540bfe78':
  Import translations. DO NOT MERGE
Remove vibrate-on-silent-mode per UX

Also show current ringtone (6265196)

Cherry-picked from
https://googleplex-android-review.googlesource.com/#/c/253780/
https://googleplex-android-review.googlesource.com/#/c/253801/

Bug: 7631982
Bug: 6265196
Change-Id: I7a9212d8672a225ab95c0fa2973ae616b393f005
Import translations. DO NOT MERGE

Change-Id: Ia5ef18a1d80ad6c5b19b69c80eccc58e738050b1
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Ibc3525697b2aca2fb71b56191fc1ac03bebb52ad
Auto-generated-cl: translation import
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Calendar into 1.1

Android 4.2.2 release 1

Conflicts:
	res/values-nl/strings.xml

Change-Id: I34dffaec7b7eacd428d7546c03a7f5f1b49700ea
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1