git.osdn.net Git - android-x86/packages-apps-Trebuchet.git/log

Baligh Uddin [Mon, 22 Oct 2012 17:13:49 +0000 (10:13 -0700)]

am 111b0b1d: (-s ours) am acc0f2ee: am ee451392: Import translations. DO NOT MERGE

* commit '111b0b1d2ba290d7f84c6a3b0057b39834950cf5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 17:11:04 +0000 (10:11 -0700)]

am fe5c9bdd: (-s ours) am 303f2f16: Import translations. DO NOT MERGE

* commit 'fe5c9bdd74fd77d8935580d528c9396257b06041':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 17:11:04 +0000 (10:11 -0700)]

am acc0f2ee: am ee451392: Import translations. DO NOT MERGE

* commit 'acc0f2eef4cf7a0f7bbf5899e22bbe99ad74348d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 17:08:24 +0000 (10:08 -0700)]

am 303f2f16: Import translations. DO NOT MERGE

* commit '303f2f162130b6efe74108976abff61e78c77206':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 17:08:21 +0000 (10:08 -0700)]

am ee451392: Import translations. DO NOT MERGE

* commit 'ee4513920446ace2bc2659e3315f5b648ec1e313':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 15:30:25 +0000 (08:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: I4464222aebee31981b8de9546222cb76d55642cd
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 15:28:57 +0000 (08:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ibc8c1dcd857312d4d6df39c18cc32708dfcaea80
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Oct 2012 15:28:19 +0000 (08:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: I58a38555e9f6f568297c4c188f0a04311eaaabe8
Auto-generated-cl: translation import

commit | commitdiff | tree

Svetoslav Ganov [Fri, 19 Oct 2012 21:30:15 +0000 (14:30 -0700)]

am bb608246: am 40d172c1: am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev

* commit 'bb608246b4d109a649dc147769b267acecb9416b':
Send correctly populated Accessibility event on Launcher state change.

commit | commitdiff | tree

Svetoslav Ganov [Fri, 19 Oct 2012 21:27:51 +0000 (14:27 -0700)]

am 40d172c1: am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev

* commit '40d172c1b5ba885797a7f9ea7aa4488e8721ea83':
Send correctly populated Accessibility event on Launcher state change.

commit | commitdiff | tree

Svetoslav Ganov [Fri, 19 Oct 2012 21:25:14 +0000 (14:25 -0700)]

am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev

* commit '303f621e574e69d46e207530737e279ed42d9c43':
Send correctly populated Accessibility event on Launcher state change.

commit | commitdiff | tree

Svetoslav Ganov [Fri, 19 Oct 2012 21:22:44 +0000 (14:22 -0700)]

Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev

commit | commitdiff | tree

Adam Cohen [Fri, 19 Oct 2012 17:51:12 +0000 (10:51 -0700)]

am a3505bfe: am 2a11598a: am 381fe4ce: Adding width / height to cling text style

* commit 'a3505bfe99a0ef2dc0e0ad8c844b3d6d45c6a9f7':
Adding width / height to cling text style

commit | commitdiff | tree

Adam Cohen [Fri, 19 Oct 2012 17:49:28 +0000 (10:49 -0700)]

am 2a11598a: am 381fe4ce: Adding width / height to cling text style

* commit '2a11598a4ab2a67876ee7fb8d5b0f313311e4cb7':
Adding width / height to cling text style

commit | commitdiff | tree

Adam Cohen [Fri, 19 Oct 2012 17:46:43 +0000 (10:46 -0700)]

am 381fe4ce: Adding width / height to cling text style

* commit '381fe4ce6fb465253c8e9bc42c2836f0c40e6231':
Adding width / height to cling text style

commit | commitdiff | tree

Adam Cohen [Fri, 19 Oct 2012 17:17:18 +0000 (10:17 -0700)]

Adding width / height to cling text style

Change-Id: Ia39b049fe414edf926c221baed3b1223199ce2a7

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Oct 2012 16:18:32 +0000 (09:18 -0700)]

am ea77b790: am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev

* commit 'ea77b790e4ba0b56fb7e43c48b91817d260dd753':
Bring dummy cling strings back as 'strings'

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Oct 2012 16:16:19 +0000 (09:16 -0700)]

am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev

* commit 'e6401ece8a3502b9ad4329a572b596175676f1d0':
Bring dummy cling strings back as 'strings'

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Oct 2012 16:13:55 +0000 (09:13 -0700)]

am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev

* commit '5b449dc3095192fecd4760d9f550de65e588e3dc':
Bring dummy cling strings back as 'strings'

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:13:15 +0000 (09:13 -0700)]

am 05565f5f: am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '05565f5f01d062672dc27ffce5a2f85227c4bfaf':
Fix NPE

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:13:14 +0000 (09:13 -0700)]

am 9160410e: am eb91462f: am d6dd7c8a: Fix NPE

* commit '9160410e40c8e060a7012a35b38f2532fa159084':
Fix NPE

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:11:18 +0000 (09:11 -0700)]

am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51':
Fix NPE

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:11:17 +0000 (09:11 -0700)]

am eb91462f: am d6dd7c8a: Fix NPE

* commit 'eb91462f087028e2ce22552ba8ce4e17b9a4f9c1':
Fix NPE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Oct 2012 16:11:12 +0000 (09:11 -0700)]

Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:08:58 +0000 (09:08 -0700)]

am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
Fix NPE

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:08:57 +0000 (09:08 -0700)]

am d6dd7c8a: Fix NPE

* commit 'd6dd7c8a21e416d7c118517569a242ac7de6c696':
Fix NPE

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 16:07:01 +0000 (09:07 -0700)]

Merge "Fix NPE" into jb-mr1-dev

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 15:32:24 +0000 (17:32 +0200)]

Fix NPE

Bug: 7356682
Change-Id: Ic6522da1ec6ac0d57f1565cef9c43949f2d7fd70

commit | commitdiff | tree

Michael Jurka [Fri, 19 Oct 2012 15:15:16 +0000 (17:15 +0200)]

Fix NPE

Bug: 7371837

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:46:51 +0000 (14:46 -0700)]

am 5c69a9cc: am 08c2f804: am 4cd7f281: remove old fashioned dream, no longer supported

* commit '5c69a9cc21815a2b5f62162fc807adb796c5ca0b':
remove old fashioned dream, no longer supported

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:44:21 +0000 (14:44 -0700)]

am 08c2f804: am 4cd7f281: remove old fashioned dream, no longer supported

* commit '08c2f8048f02eac6269a2f81ef3e1b6d23444b14':
remove old fashioned dream, no longer supported

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 21:41:40 +0000 (14:41 -0700)]

am 4cd7f281: remove old fashioned dream, no longer supported

* commit '4cd7f281056740cc22eccd156c34b98b5816d370':
remove old fashioned dream, no longer supported

commit | commitdiff | tree

Scott Main [Thu, 18 Oct 2012 19:10:03 +0000 (12:10 -0700)]

remove old fashioned dream, no longer supported

Change-Id: I87370e8dc7f3159182dac9f650223ce010d6286b

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Oct 2012 17:31:09 +0000 (10:31 -0700)]

Bring dummy cling strings back as 'strings'

The translations import recognizes 'string', 'string-array' and
'plurals' as valid items to parse, all others are ignored. This is the
reason, why these strings have not been imported back into the codebase.
Making the string declaration same as when it was removed in cl/236665

Change-Id: I6d53ba9d6267706834cb66e9ca99a1335aa01d14
Bug: 7203884

commit | commitdiff | tree

alanv [Wed, 17 Oct 2012 20:15:47 +0000 (13:15 -0700)]

Send correctly populated Accessibility event on Launcher state change.

Bug: 7362253
Change-Id: I72811292e8091a21866cb4599d37a71eb475b1d5

commit | commitdiff | tree

Romain Guy [Wed, 17 Oct 2012 19:48:55 +0000 (12:48 -0700)]

am c9996802: am 181a0b22: am e34a213c: Add missing layout attributes Bug #7334849

* commit 'c999680213d843dce6309e1026f54992c07673cd':
Add missing layout attributes Bug #7334849

commit | commitdiff | tree

Romain Guy [Wed, 17 Oct 2012 19:46:44 +0000 (12:46 -0700)]

am 181a0b22: am e34a213c: Add missing layout attributes Bug #7334849

* commit '181a0b22fbaeded3e33d09cd625fbee812a66fec':
Add missing layout attributes Bug #7334849

commit | commitdiff | tree

Romain Guy [Wed, 17 Oct 2012 19:44:14 +0000 (12:44 -0700)]

am e34a213c: Add missing layout attributes Bug #7334849

* commit 'e34a213c32d54c525fc1c4b6f79e449446435484':
Add missing layout attributes Bug #7334849

commit | commitdiff | tree

Romain Guy [Wed, 17 Oct 2012 19:04:05 +0000 (12:04 -0700)]

Add missing layout attributes
Bug #7334849

Change-Id: Iae01cf5c587716951dee849e9c4116717d137d8f

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Oct 2012 14:43:08 +0000 (07:43 -0700)]

am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)]

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I204c53690f99803900e6613188a6d9a14370e007

commit | commitdiff | tree

The Android Automerger [Mon, 15 Oct 2012 13:59:38 +0000 (06:59 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:11:09 +0000 (23:11 -0700)]

am d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'd294cac5d83eb18dea9b2f84d4202b13f3ea3c43':
Let's enhance

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:08:00 +0000 (23:08 -0700)]

am dddd6c31: am 0c2388a4: Let\'s enhance

* commit 'dddd6c3117c7e6a6af0dd6542c0e6225eb7e274d':
Let's enhance

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:04:42 +0000 (23:04 -0700)]

am 0c2388a4: Let\'s enhance

* commit '0c2388a40c3435615afa1e9b424549d29a98f44e':
Let's enhance

commit | commitdiff | tree

Jason Chen [Fri, 12 Oct 2012 17:47:11 +0000 (10:47 -0700)]

Let's enhance

Add mipmap-* launcher icon assets. Removes equivalent icons from
drawable directories and fixes up the reference to them in a layout.

Bug: 6718166
Change-Id: Ic97e3208d0b47523c8fabef949b2b06825e2fa8f

commit | commitdiff | tree

The Android Automerger [Fri, 12 Oct 2012 17:27:16 +0000 (10:27 -0700)]

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Fri, 12 Oct 2012 14:33:50 +0000 (07:33 -0700)]

am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':

commit | commitdiff | tree

The Android Open Source Project [Fri, 12 Oct 2012 14:32:00 +0000 (07:32 -0700)]

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f

commit | commitdiff | tree

Romain Guy [Fri, 12 Oct 2012 00:54:09 +0000 (17:54 -0700)]

am 4d36be5a: am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '4d36be5ac4f128531865d706359ec10f7ab5996a':
Remove unnecessary allocations during draw Bug #7327799

commit | commitdiff | tree

Romain Guy [Fri, 12 Oct 2012 00:11:14 +0000 (17:11 -0700)]

am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit 'cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
Remove unnecessary allocations during draw Bug #7327799

commit | commitdiff | tree

The Android Automerger [Thu, 11 Oct 2012 23:26:53 +0000 (16:26 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Romain Guy [Thu, 11 Oct 2012 18:12:57 +0000 (11:12 -0700)]

am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
Remove unnecessary allocations during draw Bug #7327799

commit | commitdiff | tree

Romain Guy [Thu, 11 Oct 2012 18:10:47 +0000 (11:10 -0700)]

Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev

commit | commitdiff | tree

Michael Jurka [Thu, 11 Oct 2012 15:27:50 +0000 (08:27 -0700)]

am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '74c697c7102c66c37f1588201750236234f20b12':
Add entries for string resources that appear in clings

commit | commitdiff | tree

Michael Jurka [Thu, 11 Oct 2012 15:26:07 +0000 (08:26 -0700)]

am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
Add entries for string resources that appear in clings

commit | commitdiff | tree

Michael Jurka [Thu, 11 Oct 2012 15:24:57 +0000 (08:24 -0700)]

am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
Add entries for string resources that appear in clings

commit | commitdiff | tree

Michael Jurka [Thu, 11 Oct 2012 15:23:09 +0000 (08:23 -0700)]

Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

commit | commitdiff | tree

The Android Automerger [Thu, 11 Oct 2012 15:19:41 +0000 (08:19 -0700)]

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Oct 2012 15:08:17 +0000 (08:08 -0700)]

am c476f09d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c476f09d4a8c37c16e352cbcf3745e1b33ede7fb':

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Oct 2012 15:05:52 +0000 (08:05 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96

commit | commitdiff | tree

The Android Automerger [Thu, 11 Oct 2012 14:04:12 +0000 (07:04 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Oct 2012 13:02:20 +0000 (06:02 -0700)]

am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'af503b044475dc29ce58f715739158036807e94e':

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Oct 2012 12:57:54 +0000 (05:57 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7

commit | commitdiff | tree

Michael Jurka [Thu, 11 Oct 2012 09:00:37 +0000 (11:00 +0200)]

Add entries for string resources that appear in clings

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:20:28 +0000 (21:20 -0700)]

am eddbe4e9: (-s ours) am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit 'eddbe4e9946b1175f4549617abc4b792e778ac4a':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:19:03 +0000 (21:19 -0700)]

am 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit '9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:18:36 +0000 (21:18 -0700)]

am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '61854931252710cedbb596918dee6524723d1223':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:16:59 +0000 (21:16 -0700)]

am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:16:54 +0000 (21:16 -0700)]

am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '260eb9c6ff598d792b51e5c24608602a1f5b1504':
Revert "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:14:57 +0000 (21:14 -0700)]

Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:14:47 +0000 (21:14 -0700)]

Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 4caeee6e08317abaf70b52e1a8b6b8a9e6300a7f

Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:14:37 +0000 (21:14 -0700)]

Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:14:29 +0000 (21:14 -0700)]

Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 2826bc4fb6ec196eb72be7b9ef569996e2ff0dd4

Change-Id: I232f8abdf1fdb592ba76216fc82d836294ca4e09

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:13:41 +0000 (21:13 -0700)]

Merge "Revert "Import translations. DO NOT MERGE""

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:13:25 +0000 (21:13 -0700)]

Revert "Import translations. DO NOT MERGE"

broken build

This reverts commit 83e8b468847b92ad11dead50d0c35f47b4b593e9

Change-Id: I42878c0de6156d23aa73fbf36ab699542b387c20

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 04:00:47 +0000 (21:00 -0700)]

am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9870efdd359eef447709a92fef474afc04aba24a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:58:34 +0000 (20:58 -0700)]

am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'db983fa7c46da75469d0042425b41f84b5cdc9ac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:56:51 +0000 (20:56 -0700)]

am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a2e9f101bd2369d4d344d04c317882d1ef90058c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:55:53 +0000 (20:55 -0700)]

am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f8a49f869d6d0303998e8483ca7f650a0d4e5963':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:55:33 +0000 (20:55 -0700)]

am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a7b294057a5ec8f72e8f261ab00960565e4efd3b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:55:03 +0000 (20:55 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:53:39 +0000 (20:53 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 11 Oct 2012 03:53:19 +0000 (20:53 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Romain Guy [Thu, 11 Oct 2012 01:47:33 +0000 (18:47 -0700)]

Remove unnecessary allocations during draw
Bug #7327799

Change-Id: Ic3a18fb9d850f2c692dcb187a206c61dfa8108a4

commit | commitdiff | tree

Michael Jurka [Wed, 10 Oct 2012 21:22:29 +0000 (14:22 -0700)]

am 8dcd596e: am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '8dcd596e763b70740e6bdd3cac31fedc90cb8c8a':
Update custom cling params

commit | commitdiff | tree

Michael Jurka [Wed, 10 Oct 2012 21:20:26 +0000 (14:20 -0700)]

am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
Update custom cling params

commit | commitdiff | tree

Michael Jurka [Wed, 10 Oct 2012 21:18:09 +0000 (14:18 -0700)]

am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit 'a433be70632e02e32dfc2e26f03e7cabb7f0e208':
Update custom cling params

commit | commitdiff | tree

Michael Jurka [Wed, 10 Oct 2012 21:15:46 +0000 (14:15 -0700)]

Merge "Update custom cling params" into jb-mr1-dev

commit | commitdiff | tree

Michael Jurka [Wed, 10 Oct 2012 20:20:47 +0000 (22:20 +0200)]

Update custom cling params

Bug: 7318080

Change-Id: I77d73d81a60efa3886f088e82c6ba3466f6ac331

commit | commitdiff | tree

The Android Automerger [Wed, 10 Oct 2012 21:06:57 +0000 (14:06 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Winson Chung [Wed, 10 Oct 2012 20:43:43 +0000 (13:43 -0700)]

am 47cbf108: am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '47cbf10880d96d04b78bfceec72584717f62cc30':
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

commit | commitdiff | tree

Winson Chung [Wed, 10 Oct 2012 20:41:37 +0000 (13:41 -0700)]

am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '5ad9b52148740b984509183fe3ecb9d8d81c702b':
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

commit | commitdiff | tree

Winson Chung [Wed, 10 Oct 2012 20:39:31 +0000 (13:39 -0700)]

am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '5b589a01cd291ae3599bc3824f6732c109df056a':
Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)

commit | commitdiff | tree

Winson Chung [Wed, 10 Oct 2012 20:37:57 +0000 (13:37 -0700)]

Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Oct 2012 18:31:41 +0000 (11:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I219833e13aa853c4c727ae571257005b8d199872
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Oct 2012 18:30:52 +0000 (11:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iac3a250c73e5f0b3b80675a1a993c8336ba6ade9
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Oct 2012 18:30:23 +0000 (11:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: I689ffb63079d08e7c1d7f172d118b48497a6c1b4
Auto-generated-cl: translation import

commit | commitdiff | tree

The Android Open Source Project [Wed, 10 Oct 2012 16:51:07 +0000 (09:51 -0700)]

am e37fa977: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'e37fa97752cb0e8b79b94f1c1745894b40b7d57e':

commit | commitdiff | tree

The Android Open Source Project [Wed, 10 Oct 2012 16:45:34 +0000 (09:45 -0700)]

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286