OSDN Git Service
Eric Fischer [Thu, 21 Jun 2012 05:31:19 +0000 (22:31 -0700)]
am
2574da18: Import translations. DO NOT MERGE
* commit '
2574da183322bef8eb84ab2411bc14d5ff202655':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 01:44:55 +0000 (18:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74d3d343c159a47c3375fbbb28b2579034d33d72
Wei Huang [Wed, 20 Jun 2012 18:38:34 +0000 (11:38 -0700)]
am
82220026: Merge "Fade in/out the undo bar." into jb-dev
* commit '
822200267879dfaaf77421007116e59c5bb372cd':
Fade in/out the undo bar.
Wei Huang [Wed, 20 Jun 2012 18:35:46 +0000 (11:35 -0700)]
Merge "Fade in/out the undo bar." into jb-dev
Ying Wang [Wed, 20 Jun 2012 17:22:27 +0000 (10:22 -0700)]
am
705d8085: Import translations. DO NOT MERGE
* commit '
705d808558fd3e165fd787b8628aae7db084e764':
Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 16:42:55 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391
The Android Open Source Project [Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
The Android Automerger [Wed, 20 Jun 2012 14:03:33 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Tue, 19 Jun 2012 09:34:50 +0000 (17:34 +0800)]
Fade in/out the undo bar.
The fading out happens after 3 seconds or the user swipes away.
Bug:
6610348
Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
Eric Fischer [Tue, 19 Jun 2012 20:25:41 +0000 (13:25 -0700)]
am
8c93a140: Import translations. DO NOT MERGE
* commit '
8c93a140f61d2880163dcc7dc99fa177aa4f0b2b':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:23:08 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147
Owen Lin [Tue, 19 Jun 2012 06:35:06 +0000 (14:35 +0800)]
Make SystemUI always consists with the contrller overlay.
Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix:
6679875
Wei Huang [Tue, 19 Jun 2012 18:25:37 +0000 (11:25 -0700)]
am
885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
* commit '
885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
Make SystemUI always consists with the contrller overlay.
Wei Huang [Tue, 19 Jun 2012 18:23:10 +0000 (11:23 -0700)]
Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 14:16:01 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
The Android Automerger [Tue, 19 Jun 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:51 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
Owen Lin [Tue, 19 Jun 2012 06:35:06 +0000 (14:35 +0800)]
Make SystemUI always consists with the contrller overlay.
Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix:
6679875
Wei Huang [Tue, 19 Jun 2012 06:17:17 +0000 (23:17 -0700)]
am
d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
* commit '
d937a2e931f222d2e60d9da007df4647b975eb7f':
Fix Gallery glitch due to ColorTexture.
Wei Huang [Tue, 19 Jun 2012 06:15:18 +0000 (23:15 -0700)]
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
Owen Lin [Tue, 19 Jun 2012 03:36:23 +0000 (11:36 +0800)]
Fix Gallery glitch due to ColorTexture.
Change the initial value of mTextureTarget to GL_TEXTURE_2D,
since it is default enabled.
bug:
6668616
Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
Ying Wang [Mon, 18 Jun 2012 17:39:47 +0000 (10:39 -0700)]
am
c66604cb: Import translations. DO NOT MERGE
* commit '
c66604cb29e0402ecbeb37ab79d9db0851fce3ec':
Import translations. DO NOT MERGE
Chih-Chung Chang [Mon, 18 Jun 2012 17:35:57 +0000 (10:35 -0700)]
am
2ce59cbd: Fix scaling gesture responsiveness.
* commit '
2ce59cbd4368eaf0f30cfea28891bd47155182cb':
Fix scaling gesture responsiveness.
Chih-Chung Chang [Mon, 18 Jun 2012 17:35:56 +0000 (10:35 -0700)]
am
6b891c6a: Add swipe-to-delete gesture.
* commit '
6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25':
Add swipe-to-delete gesture.
Ying Wang [Mon, 18 Jun 2012 17:22:03 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6
Chih-Chung Chang [Mon, 18 Jun 2012 09:24:58 +0000 (17:24 +0800)]
Fix scaling gesture responsiveness.
Bug:
6632011
Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
Chih-Chung Chang [Thu, 7 Jun 2012 12:09:13 +0000 (20:09 +0800)]
Add swipe-to-delete gesture.
Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:26:35 +0000 (15:26 -0700)]
resolved conflicts for merge of
cf6f99e7 to jb-dev-plus-aosp
Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
Jean-Baptiste Queru [Thu, 14 Jun 2012 19:15:37 +0000 (12:15 -0700)]
am
8d340042: Merge "Gallery2: Check privative effects"
* commit '
8d340042d2b79218b19f650803ea6a584c61f01f':
Gallery2: Check privative effects
Jean-Baptiste Queru [Thu, 14 Jun 2012 18:28:31 +0000 (11:28 -0700)]
Merge "Gallery2: Check privative effects"
Jorge Ruesga [Tue, 12 Jun 2012 21:28:58 +0000 (23:28 +0200)]
Gallery2: Check privative effects
Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps.
If gapps is not present, Gallery2 gets into a FC when click on this effects.
This patch checks if the permission "com.google.android.media.effects" exists
and hide this 2 effects if permission not exists
Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists
Patch 3: Make isPresent method from effect classes a static method
Patch 4: Change actions classes for static calling to effects classes
Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
The Android Automerger [Wed, 13 Jun 2012 15:45:06 +0000 (08:45 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Tue, 12 Jun 2012 19:45:56 +0000 (12:45 -0700)]
am
6dd67099: Import translations. DO NOT MERGE
* commit '
6dd670997a88fe7502f9ce0e4f9c872b7352027f':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 18:50:53 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f
The Android Automerger [Tue, 12 Jun 2012 18:24:10 +0000 (11:24 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Mon, 11 Jun 2012 18:22:16 +0000 (11:22 -0700)]
am
b62f354d: am
582c3bb9: Merge "Gallery2: Use ICS alert drawable"
* commit '
b62f354d4f890a20f6bec37eac83226f75a4a475':
Gallery2: Use ICS alert drawable
The Android Open Source Project [Mon, 11 Jun 2012 16:22:41 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711
Yuli Huang [Mon, 11 Jun 2012 15:48:20 +0000 (08:48 -0700)]
am
132db75a: Don\'t display loading text when loading album sets.
* commit '
132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28':
Don't display loading text when loading album sets.
Jean-Baptiste Queru [Mon, 11 Jun 2012 15:46:55 +0000 (08:46 -0700)]
am
582c3bb9: Merge "Gallery2: Use ICS alert drawable"
* commit '
582c3bb99cf58b55defa5f788d488c62f771b60e':
Gallery2: Use ICS alert drawable
Jean-Baptiste Queru [Mon, 11 Jun 2012 14:40:17 +0000 (07:40 -0700)]
Merge "Gallery2: Use ICS alert drawable"
The Android Automerger [Mon, 11 Jun 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Mon, 11 Jun 2012 06:29:23 +0000 (14:29 +0800)]
Don't display loading text when loading album sets.
bug:
6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
Eric Fischer [Fri, 8 Jun 2012 23:32:09 +0000 (16:32 -0700)]
am
1d3a2ec8: Import translations. DO NOT MERGE
* commit '
1d3a2ec89bd286f253f1f050f7e9e5406119273b':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:26:27 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
The Android Open Source Project [Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
The Android Automerger [Thu, 7 Jun 2012 14:03:57 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Wei Huang [Wed, 6 Jun 2012 21:49:49 +0000 (14:49 -0700)]
am
e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev
* commit '
e6d36bb213c749a750bffd5e37ce85c232a64ff3':
Check the offset of output rect when cropping image.
Wei Huang [Wed, 6 Jun 2012 21:47:58 +0000 (14:47 -0700)]
Merge "Check the offset of output rect when cropping image." into jb-dev
Eric Fischer [Wed, 6 Jun 2012 18:01:47 +0000 (11:01 -0700)]
am
699ef52c: Import translations. DO NOT MERGE
* commit '
699ef52cb398a2d5a7ec962e7df2837a6dbccef4':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 17:56:12 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
The Android Automerger [Wed, 6 Jun 2012 14:03:47 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Owen Lin [Wed, 30 May 2012 08:39:21 +0000 (16:39 +0800)]
Check the offset of output rect when cropping image.
bug:
6568720
Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
Wei Huang [Tue, 5 Jun 2012 18:08:59 +0000 (11:08 -0700)]
am
1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
* commit '
1b27f3096d814d7b2a536dde59d7dbfc91945a05':
Update drawable for the new resize handles.
Wei Huang [Tue, 5 Jun 2012 18:07:14 +0000 (11:07 -0700)]
Merge "Update drawable for the new resize handles." into jb-dev
Eric Fischer [Tue, 5 Jun 2012 16:47:02 +0000 (09:47 -0700)]
am
49661d3f: Import translations. DO NOT MERGE
* commit '
49661d3f313d32620cb15247a46e593e333a778d':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:39:21 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb
The Android Automerger [Tue, 5 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Tue, 5 Jun 2012 10:28:16 +0000 (18:28 +0800)]
Update drawable for the new resize handles.
bug:
6598235
Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18
Eric Fischer [Mon, 4 Jun 2012 21:56:25 +0000 (14:56 -0700)]
am
b4343fb4: Import translations. DO NOT MERGE
* commit '
b4343fb4517a760f09fb383b7b382ac793e01144':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:44:28 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e
Wei Huang [Mon, 4 Jun 2012 16:18:09 +0000 (09:18 -0700)]
am
25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
* commit '
25a9153565d0ecd760387499fce4ba10474175d2':
Update the screen nail size even if screen nail is still the same one.
Wei Huang [Mon, 4 Jun 2012 16:15:15 +0000 (09:15 -0700)]
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:04:40 +0000 (06:04 -0700)]
merge in jb-release history after reset to jb-dev
Ruei-sung Lin [Sun, 3 Jun 2012 04:34:16 +0000 (21:34 -0700)]
am
e5c8ed74: Fix b/
6590795 dejank photo effect slider
* commit '
e5c8ed74768f16e4e82c46a31d5118788dbb3a57':
Fix b/
6590795 dejank photo effect slider
Ruei-sung Lin [Thu, 31 May 2012 18:59:31 +0000 (11:59 -0700)]
Fix b/
6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:57:17 +0000 (18:57 -0700)]
Merge
79b8f0b7
Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac
Chih-Chung Chang [Fri, 1 Jun 2012 19:03:08 +0000 (12:03 -0700)]
Update the screen nail size even if screen nail is still the same one.
Because the rotation value may have changed.
Bug:
6594218
Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
Christian Robertson [Fri, 1 Jun 2012 18:11:49 +0000 (11:11 -0700)]
Adding xhdpi version of app icon. Bug:
6596419
Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759
Eric Fischer [Fri, 1 Jun 2012 18:00:46 +0000 (11:00 -0700)]
am
8da8d1d4: Import translations. DO NOT MERGE
* commit '
8da8d1d488698ce545ca056f119a03a4f4b189ec':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 17:19:04 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de
Wei Huang [Fri, 1 Jun 2012 05:19:43 +0000 (22:19 -0700)]
am
9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
* commit '
9d4ee023cb6b754d07d33fb94dd7ae33851b2d35':
Use "Gallery" instead of "Photo Studio" as the label for photo editor.
Wei Huang [Fri, 1 Jun 2012 05:17:50 +0000 (22:17 -0700)]
Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
Chih-Chung Chang [Thu, 31 May 2012 23:05:39 +0000 (16:05 -0700)]
am
6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
* commit '
6f30a44785f5dc19d3db1b3d80d828826c2a44dd':
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Chih-Chung Chang [Thu, 31 May 2012 23:03:31 +0000 (16:03 -0700)]
Merge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
Björn Lundén [Thu, 31 May 2012 21:51:07 +0000 (23:51 +0200)]
Gallery2: Use ICS alert drawable
Same bug here. It's using the old compability drawable
instead of the Holo theme one.
Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
Chih-Chung Chang [Thu, 31 May 2012 20:34:15 +0000 (13:34 -0700)]
Use "Gallery" instead of "Photo Studio" as the label for photo editor.
Bug:
6589966
Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e
Eric Fischer [Thu, 31 May 2012 18:14:09 +0000 (11:14 -0700)]
am
a72d51b6: Import translations. DO NOT MERGE
* commit '
a72d51b6a4b5dadc0dea91882e0cdafc97c652b3':
Import translations. DO NOT MERGE
Chih-Chung Chang [Thu, 31 May 2012 17:52:07 +0000 (10:52 -0700)]
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Bug:
6577802
Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
Eric Fischer [Thu, 31 May 2012 17:58:53 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I854fe48674bc25b209370d0e943bba9704fdf3cd
The Android Automerger [Thu, 31 May 2012 14:04:25 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Thu, 31 May 2012 06:21:55 +0000 (23:21 -0700)]
am
192b7f1d: Improve scale gesture snapback.
* commit '
192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998':
Improve scale gesture snapback.
Chih-Chung Chang [Wed, 30 May 2012 22:47:44 +0000 (15:47 -0700)]
Improve scale gesture snapback.
If the picture is zoomed-in, we want to keep the focus point stay in
the same position on screen, so we need to adjust the target mCurrentX
value.
Bug:
6563619
Change-Id: I87b23da99aced1490187e550bd43fad733122577
Chih-Chung Chang [Thu, 31 May 2012 05:47:20 +0000 (22:47 -0700)]
am
f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
* commit '
f3f90752ca92372d61ca0ec22a9846261cfbcbde':
If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
Chih-Chung Chang [Thu, 31 May 2012 01:36:33 +0000 (18:36 -0700)]
am
42e1fed4: Move to final position after view size change.
* commit '
42e1fed4edd9ed1e326aab2f7969242c56812952':
Move to final position after view size change.
Chih-Chung Chang [Thu, 31 May 2012 00:10:32 +0000 (17:10 -0700)]
If the focused box was at minimal scale, we try to make it the
minimal scale under the new view size.
Bug:
6584425
Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
Chih-Chung Chang [Wed, 30 May 2012 23:29:18 +0000 (16:29 -0700)]
Move to final position after view size change.
Bug:
6584188
Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
Chih-Chung Chang [Wed, 30 May 2012 20:57:00 +0000 (13:57 -0700)]
am
28b4d3a8: Merge "Improve image size change handling." into jb-dev
* commit '
28b4d3a8fd7a70647f9445752bf1a4e73b99f265':
Improve image size change handling.
Chih-Chung Chang [Wed, 30 May 2012 20:52:52 +0000 (13:52 -0700)]
Merge "Improve image size change handling." into jb-dev
Eric Fischer [Wed, 30 May 2012 17:35:20 +0000 (10:35 -0700)]
am
c23258a5: Import translations. DO NOT MERGE
* commit '
c23258a525b475666e4bff21da72a9c8a93e4971':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 30 May 2012 17:16:02 +0000 (10:16 -0700)]
Reconcile with jb-release
Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
Eric Fischer [Wed, 30 May 2012 17:10:02 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbc7268dabbede56d3fddb73f3513b8bdcde6a8d
The Android Automerger [Wed, 30 May 2012 14:04:40 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Tue, 29 May 2012 22:28:36 +0000 (15:28 -0700)]
Improve image size change handling.
- When the camera relative frame is set, we delay the change for camera
rectange until the next setImageSize call. This avoids the unwanted
intermediate state if we change them separately.
- Don't draw other screennails when the camera is in full screen. This
avoids showing other screennails when the image size changes.
- When the aspect ratio of the image changes, we assume the view angle
of the longer side doesn't change (so the aspect ratio change is because
the view angle of the shorter side changes). This matches what camera
preview does.
Bug:
6566612
Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
Wei Huang [Tue, 29 May 2012 20:14:15 +0000 (13:14 -0700)]
am
f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev
* commit '
f1f02b6ec5998102257f0c60d61b0b07df796064':
Keep screen on for user-initiated slideshow.
Wei Huang [Tue, 29 May 2012 20:11:12 +0000 (13:11 -0700)]
Merge "Keep screen on for user-initiated slideshow." into jb-dev
Eric Fischer [Tue, 29 May 2012 19:08:08 +0000 (12:08 -0700)]
am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cde8d1762af242a89aeea6062b185e7717da5a62':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:06:01 +0000 (12:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 29 May 2012 18:56:21 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
Eric Fischer [Tue, 29 May 2012 18:51:57 +0000 (11:51 -0700)]
am
fd08e675: Import translations. DO NOT MERGE
* commit '
fd08e675f3d83594bb7e78577d40fea1537a4935':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 17:57:57 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c