am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

Browse Source

* commit '48e725bdf4c92d3faf82c1788b56aa0491b566be':
  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.

...

This commit is contained in:

Mathew Inwood

2014-03-20 16:31:55 +00:00

committed by Android Git Automerger

parent 58dcef7b28 48e725bdf4

commit d6518c4b95

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available