Baligh Uddin
912260ab58
Import translations. DO NOT MERGE
...
Change-Id: I24022ecc48d9382a7da0204eb3f211138a7720b9
Auto-generated-cl: translation import
2012-09-13 10:29:26 -07:00
The Android Open Source Project and Android Git Automerger
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
The Android Open Source Project
292694aa01
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4699c3ff7316df6659977ec08e7f386f98202c43
2012-09-12 07:41:29 -07:00
Winson Chung and Android Git Automerger
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
Winson Chung and The Android Automerger
9cf962bbfa
Workaround for generating QSB icon press states. (Bug 7132477)
...
Change-Id: I7754bbb20572908cd428c12ba84a7b1160063bcb
2012-09-10 15:05:50 -07:00
Winson Chung and Android Git Automerger
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
Winson Chung
4cc332ac43
Workaround for generating QSB icon press states. (Bug 7132477)
...
Change-Id: I7754bbb20572908cd428c12ba84a7b1160063bcb
2012-09-10 12:48:24 -07:00
Michael Jurka and The Android Automerger
7fe33a39a8
Adding more debug code for dup. ItemInfo bug
...
Change-Id: I7963a59b54f05e29e485c3dcc5c0e159e36de59d
2012-09-07 16:20:59 -07:00
Michael Jurka and Android Git Automerger
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
Michael Jurka and Android Git Automerger
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
Michael Jurka and Android (Google) Code Review
061e9008b0
Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
2012-09-07 00:40:48 -07:00
The Android Open Source Project and Android Git Automerger
57a8fa0d56
am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0afc1f60b1374feb36012c9248adead192a7f081':
2012-09-06 09:12:15 -07:00
The Android Open Source Project
0afc1f60b1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I017b8998e27d05a8763bc2b301d17f8fe6a31a68
2012-09-06 07:54:47 -07:00
The Android Automerger
f1237be0a5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:34:35 -07:00
Winson Chung and Android Git Automerger
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
Winson Chung and Android Git Automerger
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
Winson Chung and Android (Google) Code Review
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
The Android Automerger
d37b1769e5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:34:31 -07:00
Michael Jurka and Android Git Automerger
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
Adam Cohen and Android Git Automerger
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
Michael Jurka and Android Git Automerger
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
Adam Cohen and Android Git Automerger
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
Michael Jurka and Android (Google) Code Review
7a397e0468
Merge "Debug code for bug b/6830207" into jb-mr1-dev
2012-09-05 03:24:47 -07:00
Michael Jurka
059798af09
Debug code for bug b/6830207
...
Change-Id: Ic951fd448a74ac84398f3e4371b2410e295f0293
2012-09-04 09:20:42 -07:00
Michael Jurka
96610d53f1
Adding more debug code for dup. ItemInfo bug
...
Change-Id: I7963a59b54f05e29e485c3dcc5c0e159e36de59d
2012-09-04 08:03:42 -07:00
Winson Chung
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
Adam Cohen
215b416c1f
Fix an error that is not being expressed
...
Change-Id: I8c3488906b5b95aaf20b996f488ff01bad76300c
2012-08-30 13:19:39 -07:00
The Android Automerger
a92dc335e8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:34:13 -07:00
Winson Chung and Android Git Automerger
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
Winson Chung and Android Git Automerger
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
Winson Chung
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
Winson Chung and Android Git Automerger
ba8fee769d
am 7d00b2fe: am 1e533d01: Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
...
* commit '7d00b2fe1c8ca38531e64bc1e6f678581403d524':
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
2012-08-28 13:02:47 -07:00
Winson Chung and Android Git Automerger
7d00b2fe1c
am 1e533d01: Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
...
* commit '1e533d01d52076c33414419930598c1d03f1b4a6':
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
2012-08-28 12:47:43 -07:00
Winson Chung and Android (Google) Code Review
1e533d01d5
Merge "Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)" into jb-mr1-dev
2012-08-28 12:45:56 -07:00
The Android Automerger
0dcaa6f710
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:34:21 -07:00
Winson Chung
81b5225279
Ensuring that unbind calls are not queued in the worker thread and executed subsequently on the main thread. (Bug 7001531)
...
Change-Id: I677242c0952d6385ca229ba300fdd5a2a7908a8a
2012-08-27 17:42:09 -07:00
Adam Cohen and Android Git Automerger
3dcc99c3d5
am c1d2a896: am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
...
* commit 'c1d2a896a72ab7a0636abafdaf45c6f524730d7c':
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
2012-08-27 17:32:07 -07:00
Adam Cohen and Android Git Automerger
c1d2a896a7
am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
...
* commit '13bdaf7c9d3e4539e2db5d9f4c2bb4d8b7a8dd79':
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
2012-08-27 17:29:38 -07:00
Adam Cohen and Android (Google) Code Review
13bdaf7c9d
Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev
2012-08-27 17:27:11 -07:00
Adam Cohen and Android Git Automerger
aaef6b71e6
am 96e18052: am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
...
* commit '96e180528b1084b5c3c6bbc284f8c218f071c37d':
Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)
2012-08-27 15:29:45 -07:00
Adam Cohen and Android Git Automerger
96e180528b
am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
...
* commit '2b3396f9c0e88d1633e16483322d2c52cfc271f3':
Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)
2012-08-27 15:26:44 -07:00
Adam Cohen and Android (Google) Code Review
2b3396f9c0
Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
2012-08-27 15:23:42 -07:00
Adam Cohen
e0489500d2
Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)
...
Change-Id: Iaaeb37f630a71f8fd54a6064602ddd10d4d4ab91
2012-08-27 15:19:51 -07:00
The Android Automerger
d16b12cb70
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:34:42 -07:00
The Android Open Source Project and Android Git Automerger
8893ca6106
am dc23178b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'dc23178be51dc97c05eab0504a91d0c0beb75806':
Temporary fix for qsb and hotseat clicking issues
2012-08-25 07:21:31 -07:00
The Android Open Source Project
dc23178be5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I7e42d7117f567e0dc45c8c1f4a3dc73a8704de19
2012-08-25 07:17:16 -07:00
Adam Cohen and Android Git Automerger
ae5d1c39dd
am 23282720: am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
...
* commit '23282720dd7972dfc528c9d55aac069acca91082':
Adding the ability to scale the hotseat or items in the hotseat
2012-08-24 14:19:17 -07:00
Adam Cohen and Android Git Automerger
23282720dd
am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
...
* commit '1dc3b9abd5ab0a39bab7694669d6784b89d362ef':
Adding the ability to scale the hotseat or items in the hotseat
2012-08-24 13:07:52 -07:00
Adam Cohen and Android (Google) Code Review
1dc3b9abd5
Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
2012-08-24 13:05:26 -07:00
Chiao Cheng and Android (Google) Code Review
edcf9b7cdc
Merge "Updating dialtacts to new package."
2012-08-24 10:23:15 -07:00
