8c8abe936d
am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit '8ffe7b76acda07a09a9c2a9eec1eb3d0c1542763': (24 commits)
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
Updating screen background assets. (Bug 12136457)
Updating Tablet clings. (Bug 11973614)
Migration update: ensuring all folders go first
Lazy load the widget preview loader class
Don't migrate shortcuts for components that no longer exist
Import translations. DO NOT MERGE
rationalize launcher backup logging
Tightening migration conditions. (Bug 11973614)
Replace "hotseat" with "Favorites tray" in user visible strings.
Remove settings in overview mode for Launcher3.
Fixing drop targets in phone / small tablet landscape (issue 12192781)
Ensure that hasFirstRunActivity is only called when necessary
Keep selected wallpaper on configuration change.
search for a valid journal
Fix NPE in Workspace.onDropCompleted
Properly saving migration cling keys.
restore app favorites and screens
Fix longpress crash.
Add ability to center the crop (disabled)
...
2014-02-15 00:20:29 +00:00
ec3aad2e30
Merge commit 'd5c6745b' into klp-dev-plus-aosp
...
Conflicts:
res/values-ar/strings.xml
res/values-de/strings.xml
res/values-fa/strings.xml
res/values-iw/strings.xml
2014-02-14 16:04:37 -08:00
0c04bfae09
Import translations. DO NOT MERGE
...
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
2014-01-15 13:52:37 -08:00
f0fa440fab
Import translations. DO NOT MERGE
...
Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357
Auto-generated-cl: translation import
2014-01-13 14:26:12 -08:00
bd2243aca1
Import translations. DO NOT MERGE
...
Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5
Auto-generated-cl: translation import
2013-12-11 21:11:15 -08:00
1d720d04bd
Import translations. DO NOT MERGE
...
Change-Id: Iba319ba73cb5b3e124ab979e1512e92bb974dd63
Auto-generated-cl: translation import
2013-11-04 16:36:15 -08:00
fe957adace
Import translations. DO NOT MERGE
...
Change-Id: Iffff9ef3e1aed54a935617c68d3d84d4fc85d975
Auto-generated-cl: translation import
2013-10-30 12:03:13 -07:00
73b1d5662f
Import translations. DO NOT MERGE
...
Change-Id: Icc8288907a72ee07081b73e54fba8770e7cf810e
Auto-generated-cl: translation import
2013-10-12 02:10:56 -07:00
e1bc195119
Import translations. DO NOT MERGE
...
Change-Id: I6229e0eb50b3f67f610bc2c704e34165c75e5bd7
Auto-generated-cl: translation import
2013-10-12 02:08:44 -07:00
9b21051912
Import translations. DO NOT MERGE
...
Change-Id: Ib79e237ea243786cf07bf5a66fe21e61f3f2776d
Auto-generated-cl: translation import
2013-10-04 19:53:45 -07:00
085314d291
Import translations. DO NOT MERGE
...
Change-Id: I185619ba0918df721761093ff046c29086496acd
Auto-generated-cl: translation import
2013-10-04 19:52:14 -07:00
e02cb2239e
Import translations. DO NOT MERGE
...
Change-Id: Iac69563dc1b8e902ca7d46f39beb13fa5ca485fd
Auto-generated-cl: translation import
2013-10-02 18:02:20 -07:00
39e36317e1
Import translations. DO NOT MERGE
...
Change-Id: I3786db949ea5e8884fd056e7d820f341251afc20
Auto-generated-cl: translation import
2013-10-02 18:00:15 -07:00
6ef40c87ef
Import translations. DO NOT MERGE
...
Change-Id: Ifeca6a682c49680a28c98bea6f859308175cdac6
Auto-generated-cl: translation import
2013-09-30 15:17:46 -07:00
c83dfbea51
Import translations. DO NOT MERGE
...
Change-Id: I1da7185f716aefec3317251cd626b5690411e76c
Auto-generated-cl: translation import
2013-09-30 15:15:19 -07:00
04ab2d8e64
Import translations. DO NOT MERGE
...
Change-Id: I423ba318d3868561b3bcb1a53199e021ac910f5a
Auto-generated-cl: translation import
2013-09-25 21:20:23 -07:00
6b600deaf1
Import translations. DO NOT MERGE
...
Change-Id: I66706f7b24f0546ec3f4b1b0ce864fc2a392558c
Auto-generated-cl: translation import
2013-09-25 21:18:26 -07:00
Mark Ashdown
Qiwen Zhao
Geoff Mendal
Baligh Uddin