am 9926da09: (-s ours) am 533e2e00: Import translations. DO NOT MERGE

* commit '9926da09cc04fd3b781be164c8f381e89641bcad':
  Import translations. DO NOT MERGE
Merge "Fix handling rotation while camera/gallery/crop is active" into jb-dev
am 4597f95e: Merge "Fix handling rotation while camera/gallery/crop is active" into jb-dev

* commit '4597f95eb94e4d71f0b20f780accfd77efc7162f':
  Fix handling rotation while camera/gallery/crop is active
am 769979f0: am 4597f95e: Merge "Fix handling rotation while camera/gallery/crop is active" into jb-dev

* commit '769979f037f1aacf6cfb842767b5c8c6fcf6b93a':
  Fix handling rotation while camera/gallery/crop is active
Check the parent for null in deleteEditor

There is a reproducible error in Contacts when the delete
action is triggered more than once and thereby crashing the
app that is fixed by addeding a null check of parent.

Change-Id: I6de29ed0139a5fb377a845da3194475b02a86ee3
merge in jb-release history after reset to jb-dev
Reconcile with jb-release

Change-Id: I851c314b8ce0aed61f82c52638359b346f2b3787
am 43ae5df9: Reconcile with jb-release

* commit '43ae5df9bc47c97dbfdea4cb8042cb3f048ad088':
Import translations. DO NOT MERGE

Change-Id: Idcb77167d679209926e5d84b0ca80982ed6fa143
Import translations. DO NOT MERGE

Change-Id: I15cfee384dbae79e1d0574586b85d516747008a8
am 6d73d8a6: Import translations. DO NOT MERGE

* commit '6d73d8a6b1d029bc231a6bdc898d19658e241022':
  Import translations. DO NOT MERGE
am b1f5446e: (-s ours) am 6d73d8a6: Import translations. DO NOT MERGE

* commit 'b1f5446e93629ac59ad0cf8c9aebb269a6fa3cd2':
  Import translations. DO NOT MERGE
Change usages of com.google.android to com.google.common.

The people app contains usages of both com.google.android and com.google.common.
Changing code to use the later guava library since it will be needed to unbundle
the app in the future.

Change-Id: I2700126e020166ea1bbbd87c40e77428efde41f3
Merge "Change usages of com.google.android to com.google.common."
Removed some dead code and a dead asset

Bug:6646933
Change-Id: I1e5dd3e475e4586e25b28c5eec72e87a23a17846
Merge "Removed some dead code and a dead asset"
Introduce land folders instead of using -w for everything

 - Also moved contacts_widget_preview into the right folder
 - Also made QC in landscape phone look like the bigger landscape versions

Bug:6646933
Change-Id: Ia56dad8763d5073ebee9858f128b4acdc3413120
merge in jb-release history after reset to jb-dev
Global import order fix.

Changed import order to be in accordance with style guide:
http://source.android.com/source/code-style.html#order-import-statements

Static imports will be placed at the top since most existing files used that
convention. It is also a style that can be handled by both eclipse and intellij.

Change-Id: Ia7013c7a2d88e5fefb8f4975d121f7fcd3fcc462
Merge "Check the parent for null in deleteEditor"