4f395af9b2
am 3e78f477: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3e78f477c237e3ac9da58b698893b482c4baefa4':
2012-09-20 12:49:03 -07:00
3e78f477c2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If5926763f15cb33557ca2550360a205beb9a86f2
2012-09-20 10:36:42 -07:00
883462790b
am 374d3996: am 9e05a5ea: Making launcher use new widget binding APIs
...
* commit '374d39968a0b2516f75a9f2815b28f1de5ff4775':
Making launcher use new widget binding APIs
2012-09-20 09:29:15 -07:00
be3c59b806
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 07:00:23 -07:00
374d39968a
am 9e05a5ea: Making launcher use new widget binding APIs
...
* commit '9e05a5ea951b4d5ffce324da8dd0656353306e6f':
Making launcher use new widget binding APIs
2012-09-20 06:07:54 -07:00
9e05a5ea95
Making launcher use new widget binding APIs
...
Change-Id: I9cd6716e1dc0c53b5c846371ea109ced4cd3d40a
2012-09-19 15:22:23 -07:00
802f16a414
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:46 -07:00
cd871d8477
am a1e38957: am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev
...
* commit 'a1e3895791ffaff12b0462ba82df906156ce1ae8':
Fixing some warnings
2012-09-18 13:31:12 -07:00
a1e3895791
am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev
...
* commit '671a3a227c0ca880b0bf4ee93623efb61a4a6be5':
Fixing some warnings
2012-09-18 13:29:09 -07:00
671a3a227c
Merge "Fixing some warnings" into jb-mr1-dev
2012-09-18 13:26:18 -07:00
da1eae4ecf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 07:00:13 -07:00
8a82c9469a
am 57aecec5: am 1190487e: Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
* commit '57aecec5bb4856579ffa4066c100db702c96f2a8':
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
2012-09-18 00:09:14 -07:00
57aecec5bb
am 1190487e: Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
* commit '1190487e15325e371c6c18181b1a5ef7ab2a79e6':
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
2012-09-18 00:03:36 -07:00
82422503fd
Fixing some warnings
...
Change-Id: I28ff3b62b831bd49e3592c1b86ba978208324c11
2012-09-17 18:10:30 -07:00
1190487e15
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
Change-Id: Ic1366f06020d1e405a6800386472a8832d683c5e
2012-09-17 16:59:21 -07:00
efb7fd59ba
am 0bc459bd: am 804503c7: Add user initialing receiver to select a unique wallpaper.
...
* commit '0bc459bdf3f5391bbac8d466a3d1c82a8d482704':
Add user initialing receiver to select a unique wallpaper.
2012-09-17 14:44:12 -07:00
c08ca67184
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 07:00:17 -07:00
0bc459bdf3
am 804503c7: Add user initialing receiver to select a unique wallpaper.
...
* commit '804503c75a12e1578f2f71ff3cb32ae912fc9451':
Add user initialing receiver to select a unique wallpaper.
2012-09-16 00:17:23 -07:00
804503c75a
Add user initialing receiver to select a unique wallpaper.
...
Change-Id: I14652d8108c2e19db821ab5526b6e630db8fe998
2012-09-16 00:00:27 -07:00
912260ab58
Import translations. DO NOT MERGE
...
Change-Id: I24022ecc48d9382a7da0204eb3f211138a7720b9
Auto-generated-cl: translation import
2012-09-13 10:29:26 -07:00
92f55b92f3
am 292694aa: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '292694aa0171ec032e9abb08f09b82319e27044d':
Workaround for generating QSB icon press states. (Bug 7132477)
Adding more debug code for dup. ItemInfo bug
2012-09-12 16:59:13 -07:00
292694aa01
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4699c3ff7316df6659977ec08e7f386f98202c43
2012-09-12 07:41:29 -07:00
13a185d85c
am 64ce9511: am 4cc332ac: Workaround for generating QSB icon press states. (Bug 7132477)
...
* commit '64ce9511888de9f42efe5561068d02eaf7c7df9b':
Workaround for generating QSB icon press states. (Bug 7132477)
2012-09-10 17:15:23 -07:00
9cf962bbfa
Workaround for generating QSB icon press states. (Bug 7132477)
...
Change-Id: I7754bbb20572908cd428c12ba84a7b1160063bcb
2012-09-10 15:05:50 -07:00
64ce951188
am 4cc332ac: Workaround for generating QSB icon press states. (Bug 7132477)
...
* commit '4cc332ac43dda54fb1b9fef35412313aa1ef9ad9':
Workaround for generating QSB icon press states. (Bug 7132477)
2012-09-10 12:50:49 -07:00
4cc332ac43
Workaround for generating QSB icon press states. (Bug 7132477)
...
Change-Id: I7754bbb20572908cd428c12ba84a7b1160063bcb
2012-09-10 12:48:24 -07:00
7fe33a39a8
Adding more debug code for dup. ItemInfo bug
...
Change-Id: I7963a59b54f05e29e485c3dcc5c0e159e36de59d
2012-09-07 16:20:59 -07:00
7c7de93399
am ac8539ce: am 061e9008: Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
...
* commit 'ac8539ceb8250ec2988234a8ec5657c187994efc':
Adding more debug code for dup. ItemInfo bug
2012-09-07 00:44:23 -07:00
ac8539ceb8
am 061e9008: Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
...
* commit '061e9008b04667d58c58036f764c35f5b9a0edad':
Adding more debug code for dup. ItemInfo bug
2012-09-07 00:42:27 -07:00
061e9008b0
Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
2012-09-07 00:40:48 -07:00
57a8fa0d56
am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0afc1f60b1374feb36012c9248adead192a7f081':
2012-09-06 09:12:15 -07:00
0afc1f60b1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I017b8998e27d05a8763bc2b301d17f8fe6a31a68
2012-09-06 07:54:47 -07:00
f1237be0a5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:34:35 -07:00
9d2334a391
am 2d702b88: am 6323a55f: Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev
...
* commit '2d702b8886e52d08164790e9752b05b186eee030':
Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)
2012-09-05 19:11:29 -07:00
2d702b8886
am 6323a55f: Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev
...
* commit '6323a55fe25789b84fa60d5eeb78c7abff6b0ccd':
Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)
2012-09-05 19:08:52 -07:00
6323a55fe2
Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev
2012-09-05 19:06:31 -07:00
d37b1769e5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:34:31 -07:00
93cee864e1
am ce440598: am 7a397e04: Merge "Debug code for bug b/6830207" into jb-mr1-dev
...
* commit 'ce44059861254b44c0ccd39ed40673e02797160a':
Debug code for bug b/6830207
2012-09-05 03:28:02 -07:00
7b8159c686
am 7d7e5daf: am 215b416c: Fix an error that is not being expressed
...
* commit '7d7e5dafaa119123e1dce1d17b5431a0d9461d8d':
Fix an error that is not being expressed
2012-09-05 03:28:01 -07:00
ce44059861
am 7a397e04: Merge "Debug code for bug b/6830207" into jb-mr1-dev
...
* commit '7a397e0468310e75f39d93fadcd43b7224c9e0c5':
Debug code for bug b/6830207
2012-09-05 03:26:19 -07:00
7d7e5dafaa
am 215b416c: Fix an error that is not being expressed
...
* commit '215b416c1f7cf0234b777155b823637a0902739f':
Fix an error that is not being expressed
2012-09-05 03:26:18 -07:00
7a397e0468
Merge "Debug code for bug b/6830207" into jb-mr1-dev
2012-09-05 03:24:47 -07:00
059798af09
Debug code for bug b/6830207
...
Change-Id: Ic951fd448a74ac84398f3e4371b2410e295f0293
2012-09-04 09:20:42 -07:00
96610d53f1
Adding more debug code for dup. ItemInfo bug
...
Change-Id: I7963a59b54f05e29e485c3dcc5c0e159e36de59d
2012-09-04 08:03:42 -07:00
8a4351063f
Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)
...
Change-Id: I5660b447521646f820fb2497f327e965d99ac207
2012-08-30 17:18:59 -07:00
215b416c1f
Fix an error that is not being expressed
...
Change-Id: I8c3488906b5b95aaf20b996f488ff01bad76300c
2012-08-30 13:19:39 -07:00
a92dc335e8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:34:13 -07:00
c52baf5113
am c403a58f: am 5a0f45fe: Fixing some spacing issues related to new 10inch layout. (Bug 6955380, Bug 7035262, Bug 7056508)
...
* commit 'c403a58fa65341e8e02ec6b880c9eda0051a461e':
Fixing some spacing issues related to new 10inch layout. (Bug 6955380, Bug 7035262, Bug 7056508)
2012-08-28 17:25:54 -07:00
c403a58fa6
am 5a0f45fe: Fixing some spacing issues related to new 10inch layout. (Bug 6955380, Bug 7035262, Bug 7056508)
...
* commit '5a0f45fe278e697cd5d8088da23a4321b3acf991':
Fixing some spacing issues related to new 10inch layout. (Bug 6955380, Bug 7035262, Bug 7056508)
2012-08-28 17:23:07 -07:00
5a0f45fe27
Fixing some spacing issues related to new 10inch layout. (Bug 6955380, Bug 7035262, Bug 7056508)
...
Change-Id: I589fe6c2475cfff12599eee9b490b2d4dc86511a
2012-08-28 17:08:56 -07:00
The Android Open Source Project
Adam Cohen
The Android Automerger
Michael Jurka
Winson Chung
Dianne Hackborn
Baligh Uddin