OSDN Git Service
Owen Lin [Thu, 21 Jun 2012 09:05:10 +0000 (17:05 +0800)]
Remove hardwired strings for no external storage.
bug:
6682495
Change-Id: I68652d6b01842a42907b953574d563cf98e65219
Eric Fischer [Thu, 21 Jun 2012 19:03:47 +0000 (12:03 -0700)]
am
3ca90d33: (-s ours) am
424df443: Import translations. DO NOT MERGE
* commit '
3ca90d33f83ba529349a4c1e577879af8220a33a':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:52:47 +0000 (11:52 -0700)]
am
424df443: Import translations. DO NOT MERGE
* commit '
424df443c6d1252c858d90e6e3a73914e81e4d14':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib58116d9f2da412110e7a45fe8c41eea73f771b1
Eric Fischer [Thu, 21 Jun 2012 18:01:30 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7bedf0d5a4ef1a25a0474b56773da7c635317e
Wu-cheng Li [Thu, 21 Jun 2012 08:45:55 +0000 (16:45 +0800)]
Use View.setBackgroundDrawable instead of setBackground.
View.setBackground was added in API 16. Use setBackgroundDrawable
instead.
bug:
6698428
Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
Eric Fischer [Thu, 21 Jun 2012 05:34:25 +0000 (22:34 -0700)]
am
2e671684: (-s ours) am
2574da18: Import translations. DO NOT MERGE
* commit '
2e67168492d5453876e913937ed1e36111fc2e48':
Import translations. DO NOT MERGE
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:45:30 +0000 (18:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: If82aede2b76dc81e117d9b6e62bb21c96aaf8914
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:41:47 +0000 (11:41 -0700)]
am
254a6b42: am
82220026: Merge "Fade in/out the undo bar." into jb-dev
* commit '
254a6b42372179bcc9cf6166639325d11411be77':
Fade in/out the undo bar.
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:25:21 +0000 (10:25 -0700)]
am
f058c3e7: (-s ours) am
705d8085: Import translations. DO NOT MERGE
* commit '
f058c3e790e5d5d811a925808111abf4671f439e':
Import translations. DO NOT MERGE
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:43:37 +0000 (09:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie875f22d881a5f35fce1484e0cfe6237b15699f7
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:31:47 +0000 (08:31 -0700)]
am
377329db: Reconcile with jb-release
* commit '
377329db75cc550ed78418c0c6a04a5ac534e5ba':
Make SystemUI always consists with the contrller overlay.
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
Owen Lin [Wed, 20 Jun 2012 05:55:16 +0000 (13:55 +0800)]
Move LongSparseArray into Gallery for unbundling.
Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
Eric Fischer [Tue, 19 Jun 2012 20:27:21 +0000 (13:27 -0700)]
am
2e3a1767: (-s ours) am
8c93a140: Import translations. DO NOT MERGE
* commit '
2e3a1767f4e0b7769f0726795efba3a8f7c1de1f':
Import translations. DO NOT MERGE
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:58 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: If311f3cbb087651e37b00789c69cd4035ec03e02
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:27:42 +0000 (11:27 -0700)]
am
382feb11: am
885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
* commit '
382feb11b767600d6aed8ad97d08d9de7a8673e0':
Make SystemUI always consists with the contrller overlay.
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:20:42 +0000 (07:20 -0700)]
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:16:19 +0000 (06:16 -0700)]
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:19:48 +0000 (23:19 -0700)]
am
078be806: am
d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
* commit '
078be806c9caa4c750e17d44851e075e8cf09ef2':
Fix Gallery glitch due to ColorTexture.
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:52:40 +0000 (10:52 -0700)]
am
90e71542: (-s ours) am
c66604cb: Import translations. DO NOT MERGE
* commit '
90e71542d1307a3b142509ee658304920d1b3f3d':
Import translations. DO NOT MERGE
Chih-Chung Chang [Mon, 18 Jun 2012 17:52:38 +0000 (10:52 -0700)]
am
f915fe3a: am
2ce59cbd: Fix scaling gesture responsiveness.
* commit '
f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e':
Fix scaling gesture responsiveness.
Chih-Chung Chang [Mon, 18 Jun 2012 17:52:38 +0000 (10:52 -0700)]
am
756359c0: am
6b891c6a: Add swipe-to-delete gesture.
* commit '
756359c0bb6aa1d97c48a621f6d0dda64c2ca055':
Add swipe-to-delete gesture.
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:38 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1876c5daebce55dc45ee46d493a8f6494bce54a
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 [Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)]
am
e0279d33: resolved conflicts for merge of
cf6f99e7 to jb-dev-plus-aosp
* commit '
e0279d33974a095b12abfe33f3e0be84b5e7b7d0':
Gallery2: Check privative effects
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 20:15:22 +0000 (13:15 -0700)]
am
295c2453: (-s ours) am
6dd67099: Import translations. DO NOT MERGE
* commit '
295c2453f820709b8aa2a431940af1020d2de585':
Import translations. DO NOT MERGE
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:51:32 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb929a3d9027bfc52a8fe9fd49d06a8ee22b268f
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:26:51 +0000 (11:26 -0700)]
am
27d6bf93: am
b62f354d: am
582c3bb9: Merge "Gallery2: Use ICS alert drawable"
* commit '
27d6bf937c3d9934fed171ea69aafaf90c9463e6':
Gallery2: Use ICS alert drawable
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
Eric Fischer [Mon, 11 Jun 2012 17:24:33 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1eb9710c0fdf95d4d39a3b36ecb2606a64723177
The Android Open Source Project [Mon, 11 Jun 2012 16:25:49 +0000 (09:25 -0700)]
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:49:58 +0000 (08:49 -0700)]
am
4712ffa6: am
132db75a: Don\'t display loading text when loading album sets.
* commit '
4712ffa668e60c23418be104a66f07da57d64cc2':
Don't display loading text when loading album sets.
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:33:46 +0000 (16:33 -0700)]
am
30116cd2: (-s ours) am
1d3a2ec8: Import translations. DO NOT MERGE
* commit '
30116cd2dd2b0da7e70537d6a52b1a620eef75d0':
Import translations. DO NOT MERGE
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:55:30 +0000 (07:55 -0700)]
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:51:43 +0000 (14:51 -0700)]
am
5543eac3: am
e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev
* commit '
5543eac38b2bd0e0606deaf8da15d20f415c748f':
Check the offset of output rect when cropping image.
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:06:13 +0000 (11:06 -0700)]
am
6edae671: (-s ours) am
699ef52c: Import translations. DO NOT MERGE
* commit '
6edae671aa8f5da345420185f7ecd61fe2d2e6dd':
Import translations. DO NOT MERGE
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:34 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5847ab732e86841a916b6d641766c329c4e367be
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 19:26:00 +0000 (12:26 -0700)]
am
98e39643: am
1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
* commit '
98e3964391668a5774e2d9b06751e8b2c61c144a':
Update drawable for the new resize handles.
Eric Fischer [Tue, 5 Jun 2012 19:25:36 +0000 (12:25 -0700)]
am
cc9da2a5: (-s ours) am
49661d3f: Import translations. DO NOT MERGE
* commit '
cc9da2a5704a3b76027eac8a20ff2c1de407a9f9':
Import translations. DO NOT MERGE
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:40 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ad1b46db67adde3e45c2dc24b77622a29af3150
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 22:00:18 +0000 (15:00 -0700)]
am
8ddda9cd: (-s ours) am
b4343fb4: Import translations. DO NOT MERGE
* commit '
8ddda9cda3a1a04d21f209dcbbdc81964582f6bd':
Import translations. DO NOT MERGE
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:45:24 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I630c967050e27c228f1f05333cc2a3590b3eadcb
Eric Fischer [Mon, 4 Jun 2012 21:44:28 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e