tree ec628640dcb3cb92a0651124e6b5fd1e3cfa53f0
parent f3e2124636b605bb5cd2c386548cbea98c4fce12
parent ec3aad2e30ead7923f659c197c57f843cc55c913
author Qiwen Zhao <zhao@google.com> 1392422795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392422795 +0000

am ec3aad2e: Merge commit \'d5c6745b\' into klp-dev-plus-aosp

* commit 'ec3aad2e30ead7923f659c197c57f843cc55c913':
  Tightening migration conditions. (Bug 11973614)
  Increasing string length for translation (Bug 12524122)
  Import translations. DO NOT MERGE
  Set App context from WallpaperChanged receiver. (Bug 12525684)
  Updating assets and text for migration cling. (Bug 11973614)
  Adding migration Clings. (Bug 11973614)
  New launcher2 icon migration algorithm.
  Quick patch for b/12446428.
  Allow DISABLE_ALL_APPS to be set using a system property.