GitLab

am 9038d236: (-s ours) am c1c2a7f0: am a2943ea1: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9038d236'

* commit '9038d236':
  Import revised translations.  DO NOT MERGE

Merge commit 'c1c2a7f0' into eclair-mr2-plus-aosp

* commit 'c1c2a7f0':
  Import revised translations.  DO NOT MERGE

Merge commit 'a2943ea1' into eclair-mr2

* commit 'a2943ea1':
  Import revised translations.  DO NOT MERGE

am 4495db46: (-s ours) am f1837f81: am 984ed51a: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '4495db46'

* commit '4495db46':
  Import revised translations.  DO NOT MERGE

am e1f9c798: am 6e7f5426: am ccb4dda8: Fix for 2268060, 2251223 if conditional initializing package label. Also load the label from the new pkg for existing packages Use installer\'s metrics and configuration info when creating resources for new package

Merge commit 'e1f9c798'

* commit 'e1f9c798':
  Fix for 2268060, 2251223 if conditional initializing package label.

Merge commit 'f1837f81' into eclair-mr2-plus-aosp

* commit 'f1837f81':
  Import revised translations.  DO NOT MERGE

am 6e7f5426: am ccb4dda8: Fix for 2268060, 2251223 if conditional initializing package label. Also load the label from the new pkg for existing packages Use installer\'s metrics and configuration info when creating resources for new package

Merge commit '6e7f5426' into eclair-mr2-plus-aosp

* commit '6e7f5426':
  Fix for 2268060, 2251223 if conditional initializing package label.

Merge commit '984ed51a' into eclair-mr2

* commit '984ed51a':
  Import revised translations.  DO NOT MERGE

am ccb4dda8: Fix for 2268060, 2251223 if conditional initializing package label. Also load the label from the new pkg for existing packages Use installer\'s metrics and configuration info when creating resources for new package

Merge commit 'ccb4dda8' into eclair-mr2

* commit 'ccb4dda8':
  Fix for 2268060, 2251223 if conditional initializing package label.

Also load the label from the new pkg for existing packages
Use installer's metrics and configuration info when creating resources
for new package

Merge commit 'ac2d5a1d'

* commit 'ac2d5a1d':
  eclair snapshot

Merge commit 'goog/stage-korg-master' into HEAD

am ba95d8b8: (-s ours) am 98cbef69: am 692a423e: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'ba95d8b8'

* commit 'ba95d8b8':
  Import revised translations.  DO NOT MERGE

Merge commit '98cbef69' into eclair-mr2-plus-aosp

* commit '98cbef69':
  Import revised translations.  DO NOT MERGE

Merge commit '692a423e' into eclair-mr2

* commit '692a423e':
  Import revised translations.  DO NOT MERGE

Merge commit '692a423e' into eclair-plus-aosp

* commit '692a423e':
  Import revised translations.  DO NOT MERGE

Approver: jerryw

Merge commit '46fea03a'

* commit '46fea03a':
  Ignore orientation changes when installing/uninstalling

am 7250e92c: am 45594bea: am f80cb7b8: move creating temp file to InstallAppProgress and deal with cleanly deleting the file

Merge commit '7250e92c'

* commit '7250e92c':
  move creating temp file to InstallAppProgress

Merge commit 'b7724a51' into eclair-mr2-plus-aosp

* commit 'b7724a51':
  Ignore orientation changes when installing/uninstalling

am 45594bea: am f80cb7b8: move creating temp file to InstallAppProgress and deal with cleanly deleting the file

Merge commit '45594bea' into eclair-mr2-plus-aosp

* commit '45594bea':
  move creating temp file to InstallAppProgress

Merge commit 'ea6db5d5' into eclair-mr2

* commit 'ea6db5d5':
  Ignore orientation changes when installing/uninstalling

Merge commit 'f80cb7b8' into eclair-mr2

* commit 'f80cb7b8':
  move creating temp file to InstallAppProgress

Merge commit 'ea6db5d5' into eclair-plus-aosp

* commit 'ea6db5d5':
  Ignore orientation changes when installing/uninstalling

Merge commit 'f80cb7b8' into eclair-plus-aosp

* commit 'f80cb7b8':
  move creating temp file to InstallAppProgress

and deal with cleanly deleting the file

am 51c22596: am 13ed5aa1: am f0750688: Use nonlocalized label when installing packages. Also invoke the right method based on if its an installed application or not. just move the if condition prior to initializing the view

Merge commit '51c22596'

* commit '51c22596':
  Use nonlocalized label when installing packages.

am 13ed5aa1: am f0750688: Use nonlocalized label when installing packages. Also invoke the right method based on if its an installed application or not. just move the if condition prior to initializing the view

Merge commit '13ed5aa1' into eclair-mr2-plus-aosp

* commit '13ed5aa1':
  Use nonlocalized label when installing packages.

am f0750688: Use nonlocalized label when installing packages. Also invoke the right method based on if its an installed application or not. just move the if condition prior to initializing the view

Merge commit 'f0750688' into eclair-mr2

* commit 'f0750688':
  Use nonlocalized label when installing packages.

am f0750688: Use nonlocalized label when installing packages. Also invoke the right method based on if its an installed application or not. just move the if condition prior to initializing the view

Merge commit 'f0750688' into eclair-plus-aosp

* commit 'f0750688':
  Use nonlocalized label when installing packages.

Also invoke the right method based on if its an installed application
or not. just move the if condition prior to initializing the view

am 6d03bdb4: (-s ours) am 3ffedacf: am 04a8dfdc: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '6d03bdb4'

* commit '6d03bdb4':
  Import revised translations.  DO NOT MERGE

Merge commit '3ffedacf' into eclair-mr2-plus-aosp

* commit '3ffedacf':
  Import revised translations.  DO NOT MERGE

Merge commit '04a8dfdc' into eclair-mr2

* commit '04a8dfdc':
  Import revised translations.  DO NOT MERGE