| commit | d6518c4b9569ddf9a8d66e4e60dc77c18e0ecb05 | [log] [tgz] |
|---|---|---|
| author | Mathew Inwood <mathewi@google.com> | Thu Mar 20 16:31:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 16:31:55 2014 +0000 |
| tree | 79bf6c1f0488ea29bced0cdf318174dcf7a2f246 | |
| parent | 58dcef7b28ec0bbc8e097b2cd45a6c6542a4cdef [diff] | |
| parent | 48e725bdf4c92d3faf82c1788b56aa0491b566be [diff] |
am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * 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.