tree e066cd421c94efcd6e9b391f3e80e4864263a099
parent 9ee142497e1272697393867be0bccddd758aef35
parent 56ca86b7c177fd6fb330d6cb3631070e8689cd87
author Mathew Inwood <mathewi@google.com> 1395277975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277975 +0000

am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':
  Fix issue where clings didn't appear after set up wizard (issue 13077829)
  Import translations. DO NOT MERGE
  use restored icon for restored app shortcuts
  Fix for Can't convert to dimension: type=0x12 Crash on JB deviecs.