OSDN Git Service
Pin Ting [Mon, 6 Feb 2012 06:26:07 +0000 (22:26 -0800)]
am
acd15c73: Merge "Shows status bar in gallery when in portrait view."
* commit '
acd15c734363293975b259168537ed811889fcdc':
Shows status bar in gallery when in portrait view.
Pin Ting [Mon, 6 Feb 2012 06:24:13 +0000 (22:24 -0800)]
Merge "Shows status bar in gallery when in portrait view."
Pin Ting [Fri, 3 Feb 2012 10:35:00 +0000 (18:35 +0800)]
Shows status bar in gallery when in portrait view.
bug:
5467810
Shows status bar in gallery, crop activity, picker activity when in
portrait view; hide status bar when in landscape view.
Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
Eric Fischer [Fri, 3 Feb 2012 20:03:49 +0000 (12:03 -0800)]
am
2dea7258: Import translations. DO NOT MERGE
* commit '
2dea725878d947401d13a6ce9cd3f620cabdd075':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 19:59:47 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35f3f1aa3dac1e55f3e15edbdf9b426d9967bb4f
Eric Fischer [Fri, 3 Feb 2012 19:59:30 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia25a1b5ebc12306a5bea1f8bc70dc8aef12016d6
Ray Chen [Fri, 3 Feb 2012 08:33:05 +0000 (00:33 -0800)]
am
585ae3d5: Fix
5948229 [Bug Bash] The app icon is clickable in album set view
* commit '
585ae3d5deccc58e282c55b980ef31eb655537ee':
Fix
5948229 [Bug Bash] The app icon is clickable in album set view
Ray Chen [Fri, 3 Feb 2012 08:10:57 +0000 (00:10 -0800)]
am
1e32e279: Fix
5658975 Gallery has \'CROP\' instead of \'SAVE\' or \'OK\' while setting the picture as wallpaper
* commit '
1e32e279f272392d61bc29aa31687c173071cdf0':
Fix
5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
Ray Chen [Fri, 3 Feb 2012 03:25:24 +0000 (11:25 +0800)]
Fix
5948229 [Bug Bash] The app icon is clickable in album set view
Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
Ray Chen [Fri, 3 Feb 2012 03:07:50 +0000 (11:07 +0800)]
Fix
5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
Change-Id: I520d760df2932f6dcb318c1362f15b82b044bcb3
Eric Fischer [Thu, 2 Feb 2012 20:12:14 +0000 (12:12 -0800)]
am
26e78b45: Import translations. DO NOT MERGE
* commit '
26e78b45e25c069b3a4d6ca45748c61cdc0df3a9':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:05:26 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f
Eric Fischer [Thu, 2 Feb 2012 20:05:08 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I997af10112474228ed5e1ff9a9b0b3000b026081
Pin Ting [Thu, 2 Feb 2012 07:00:46 +0000 (23:00 -0800)]
am
ac7c72d8: Merge "Shows video filename passed from other apps."
* commit '
ac7c72d8d8f7af477a74656603e0c27e01c25106':
Shows video filename passed from other apps.
Pin Ting [Thu, 2 Feb 2012 07:00:45 +0000 (23:00 -0800)]
am
b333d7a4: Merge "Shows image filename passed from other apps."
* commit '
b333d7a407d108d3c6de4bf016d0d6f7854ef903':
Shows image filename passed from other apps.
Pin Ting [Thu, 2 Feb 2012 06:59:10 +0000 (22:59 -0800)]
Merge "Shows video filename passed from other apps."
Pin Ting [Thu, 2 Feb 2012 06:58:57 +0000 (22:58 -0800)]
Merge "Shows image filename passed from other apps."
Pin Ting [Wed, 18 Jan 2012 10:15:27 +0000 (18:15 +0800)]
Shows video filename passed from other apps.
bug:
5796182
Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
Pin Ting [Wed, 18 Jan 2012 09:19:42 +0000 (17:19 +0800)]
Shows image filename passed from other apps.
bug:
5796182
This change will be followed up by a change to the class
android.content.Intent.
Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
Chih-Chung Chang [Thu, 2 Feb 2012 02:33:40 +0000 (18:33 -0800)]
am
bea98898: Merge "Localize the "fail to load image" toast message."
* commit '
bea9889873cc08775aa85dd169d9247a9eab42b3':
Localize the "fail to load image" toast message.
Chih-Chung Chang [Thu, 2 Feb 2012 02:32:06 +0000 (18:32 -0800)]
Merge "Localize the "fail to load image" toast message."
The Android Open Source Project [Wed, 1 Feb 2012 18:10:15 +0000 (10:10 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:06:21 +0000 (10:06 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:24 +0000 (10:01 -0800)]
am
79c31703: Reconcile with ics-mr1-release
* commit '
79c31703151da5eaf8fb74a249091ddd54d0c2e9':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:34 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I65ae67dd34f8ee65190369e77739b02e9937ab6c
Chih-Chung Chang [Wed, 1 Feb 2012 10:40:57 +0000 (18:40 +0800)]
Localize the "fail to load image" toast message.
Bug
5875813.
Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
Eric Fischer [Tue, 31 Jan 2012 20:59:32 +0000 (12:59 -0800)]
am
243264a1: Import translations. DO NOT MERGE
* commit '
243264a16cff574eac9d71d025299e23d574db8c':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 31 Jan 2012 19:14:48 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c
Eric Fischer [Mon, 30 Jan 2012 22:54:18 +0000 (14:54 -0800)]
am
6e3c9b84: Import translations. DO NOT MERGE
* commit '
6e3c9b849c483000911eaf18c5858f141f0df82c':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 30 Jan 2012 22:50:09 +0000 (14:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9
Eric Fischer [Thu, 26 Jan 2012 22:11:16 +0000 (14:11 -0800)]
am
4edf83ca: Merge "Import translations. DO NOT MERGE"
* commit '
4edf83ca0dc58bdfed4864958ce0b1975e35e69c':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:08:45 +0000 (14:08 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 26 Jan 2012 22:08:32 +0000 (14:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a
Eric Fischer [Thu, 26 Jan 2012 21:49:47 +0000 (13:49 -0800)]
am
3ae681b8: Import translations. DO NOT MERGE
* commit '
3ae681b865447b986aba148c78767cb7a178303d':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 21:45:09 +0000 (13:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df
The Android Open Source Project [Fri, 20 Jan 2012 23:56:56 +0000 (15:56 -0800)]
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
7e11af8f: Reconcile with ics-mr1-release
* commit '
7e11af8f5813972dd64032e70068e10f87771234':
The Android Open Source Project [Thu, 19 Jan 2012 21:07:12 +0000 (13:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133
Chih-Chung Chang [Tue, 17 Jan 2012 21:11:29 +0000 (13:11 -0800)]
Chih-Chung Chang [Tue, 17 Jan 2012 21:09:52 +0000 (13:09 -0800)]
Chih-Chung Chang [Tue, 17 Jan 2012 19:45:24 +0000 (11:45 -0800)]
Pin Ting [Mon, 16 Jan 2012 04:41:54 +0000 (20:41 -0800)]
am
f31954e5: Fixes gallery crash due to attempt to open deleted photo.
* commit '
f31954e5b5f227b07fe377545fb05327d7e7ffe6':
Fixes gallery crash due to attempt to open deleted photo.
Pin Ting [Fri, 13 Jan 2012 09:48:10 +0000 (17:48 +0800)]
Fixes gallery crash due to attempt to open deleted photo.
bug:
5630894
Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
The Android Automerger [Sat, 14 Jan 2012 00:18:42 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 5 Jan 2012 04:00:53 +0000 (12:00 +0800)]
Patch.
Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
Chih-Chung Chang [Mon, 9 Jan 2012 09:40:58 +0000 (01:40 -0800)]
am
d05b0be1: Fix
5835642: Only finish the page when it\'s still active.
* commit '
d05b0be120bb217b4f56add24a4b31bee92455b2':
Fix
5835642: Only finish the page when it's still active.
Chih-Chung Chang [Mon, 9 Jan 2012 04:41:57 +0000 (12:41 +0800)]
Fix
5835642: Only finish the page when it's still active.
The original code can call finishState twice in a row with the calling
stack: finishState -> onPause -> clearLoadingBit -> finishState.
Change clearLoadingBit to call finishState only when it's currently active.
Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
Eric Fischer [Thu, 29 Dec 2011 23:00:11 +0000 (15:00 -0800)]
am
1ed7e8f2: Import revised translations.
* commit '
1ed7e8f258b47c82e7e066f515aea1483ee53584':
Import revised translations.
Eric Fischer [Thu, 29 Dec 2011 20:18:49 +0000 (12:18 -0800)]
Import revised translations.
Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31
Owen Lin [Thu, 15 Dec 2011 18:08:24 +0000 (10:08 -0800)]
am
abe7f64f: Merge "Support querying account and picasa id of a picasa image."
* commit '
abe7f64f9d433a0dad45acd93fbafa0a5e236998':
Support querying account and picasa id of a picasa image.
Owen Lin [Wed, 14 Dec 2011 07:50:27 +0000 (23:50 -0800)]
Merge "Support querying account and picasa id of a picasa image."
Owen Lin [Wed, 14 Dec 2011 04:30:39 +0000 (12:30 +0800)]
Support querying account and picasa id of a picasa image.
Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6
fix:
5482269
Owen Lin [Tue, 13 Dec 2011 13:48:05 +0000 (05:48 -0800)]
am
89d07534: Make sure the backgroud is cleared in MovieActivity.
* commit '
89d0753435b0fdd9fdedc1778156a79786731c70':
Make sure the backgroud is cleared in MovieActivity.
Owen Lin [Mon, 12 Dec 2011 07:07:28 +0000 (15:07 +0800)]
Make sure the backgroud is cleared in MovieActivity.
Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d
fix:
5742974
The Android Open Source Project [Fri, 9 Dec 2011 23:03:54 +0000 (15:03 -0800)]
The Android Open Source Project [Fri, 9 Dec 2011 22:57:52 +0000 (14:57 -0800)]
am
520b7ee0: Reconcile with ics-mr1-release
* commit '
520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3ff57eb4e0a33e875d39ce06a12f6809bc5f50db
Yuli Huang [Tue, 6 Dec 2011 06:10:45 +0000 (22:10 -0800)]
am
6ff91673: Improve Doodle UI for ending Doodle effect.
* commit '
6ff9167388b26ea67cad4497ddd2cf42e882b928':
Improve Doodle UI for ending Doodle effect.
Yuli Huang [Mon, 5 Dec 2011 13:00:58 +0000 (21:00 +0800)]
Improve Doodle UI for ending Doodle effect.
As doodle-view was removed before the final doodle results are
produced by MFF and displayed, doodles drawn disappeared temporarily
when the user exits Doodle effect.
Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
Yuli Huang [Mon, 5 Dec 2011 09:22:32 +0000 (01:22 -0800)]
am
26c03546: Fix effect-label layout and a TODO.
* commit '
26c0354619d6229a937f4232e2c9744385c046ad':
Fix effect-label layout and a TODO.
Yuli Huang [Fri, 2 Dec 2011 19:23:52 +0000 (03:23 +0800)]
Fix effect-label layout and a TODO.
1. Seekbar was wrongly placed below effect label because of the added
order.
2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit.
Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
Yuli Huang [Fri, 2 Dec 2011 17:09:42 +0000 (09:09 -0800)]
am
5a3b6e09: Merge "Simplify EffectAction."
* commit '
5a3b6e0954b19142f4f4de09ce9f7e38052f283c':
Simplify EffectAction.
Yuli Huang [Fri, 2 Dec 2011 17:08:12 +0000 (09:08 -0800)]
Merge "Simplify EffectAction."
Yuli Huang [Fri, 2 Dec 2011 11:55:05 +0000 (19:55 +0800)]
Simplify EffectAction.
1. Make the whole effect item clickable instead of just the icon.
2. Rename interfaces/methods to improve readability.
Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
The Android Open Source Project [Fri, 2 Dec 2011 15:56:59 +0000 (07:56 -0800)]
am
292467da: Reconcile with ics-mr1-release
* commit '
292467da0d048ebabc70879d52508ca5d83674f8':
The Android Open Source Project [Fri, 2 Dec 2011 15:53:37 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaaf97ddd8d3786e661679d822ccdb7241303db51
Yuli Huang [Fri, 2 Dec 2011 10:27:19 +0000 (02:27 -0800)]
am
1d9a19dd: Remove unnecessary code.
* commit '
1d9a19ddfcbedb6d52f93dd5e5fefe6a3a9dfc26':
Remove unnecessary code.
Yuli Huang [Fri, 2 Dec 2011 09:35:34 +0000 (17:35 +0800)]
Remove unnecessary code.
Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done
in MFF.
Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
Yuli Huang [Fri, 2 Dec 2011 08:10:29 +0000 (00:10 -0800)]
am
203bb023: Merge "Refactor to remove obsolete design and improve code consistency."
* commit '
203bb023e745d2ee36e9bf19a638a2a7c817da40':
Refactor to remove obsolete design and improve code consistency.
Yuli Huang [Fri, 2 Dec 2011 08:09:00 +0000 (00:09 -0800)]
Merge "Refactor to remove obsolete design and improve code consistency."
The Android Automerger [Fri, 2 Dec 2011 00:46:14 +0000 (16:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 20:44:33 +0000 (12:44 -0800)]
am
86c245b0: am
a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
* commit '
86c245b0f5f63e4bbde5eb5350024cc31586ee25':
Remove dependency on support library. DO NOT MERGE.
Daniel Sandler [Thu, 1 Dec 2011 20:41:58 +0000 (12:41 -0800)]
am
a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
* commit '
a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3':
Remove dependency on support library. DO NOT MERGE.
Daniel Sandler [Thu, 1 Dec 2011 20:31:50 +0000 (12:31 -0800)]
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
Jeff Sharkey [Thu, 1 Dec 2011 19:58:59 +0000 (11:58 -0800)]
am
f4579c85: resolved conflicts for merge of
c0715fd5 to master
* commit '
f4579c85a6da20767170e31ef89f22c5f1932ef4':
Add close() to Download cache.
Jeff Sharkey [Thu, 1 Dec 2011 19:48:20 +0000 (11:48 -0800)]
resolved conflicts for merge of
c0715fd5 to master
Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
Daniel Sandler [Thu, 1 Dec 2011 16:19:37 +0000 (11:19 -0500)]
Remove dependency on support library. DO NOT MERGE.
Bug:
5689684
Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
Yuli Huang [Mon, 28 Nov 2011 12:05:27 +0000 (20:05 +0800)]
Refactor to remove obsolete design and improve code consistency.
1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.
Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
Owen Lin [Thu, 1 Dec 2011 06:43:54 +0000 (14:43 +0800)]
Add close() to Download cache.
Change-Id: Idf0482e9f3cd2f667dca902ffea75bb0a0225d2d
fix:
5664497
The Android Open Source Project [Wed, 30 Nov 2011 22:05:14 +0000 (14:05 -0800)]
am
3a106dce: Reconcile with ics-mr1-release
* commit '
3a106dceb0f34751fa8b78de192ed75b2f6e2795':
Chih-Chung Chang [Wed, 30 Nov 2011 22:03:47 +0000 (14:03 -0800)]
am
fa860f37: am
764482c4: Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
* commit '
fa860f3772f4b69a837add25de76dbe06daa8b3f':
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Chih-Chung Chang [Wed, 30 Nov 2011 22:03:47 +0000 (14:03 -0800)]
am
e11e36e2: am
002a3fec: Fix
5686493: Crash when try to click any thumbnail
* commit '
e11e36e2aefa19e99e40c78992e86764a75528c3':
Fix
5686493: Crash when try to click any thumbnail
Daniel Sandler [Wed, 30 Nov 2011 22:03:46 +0000 (14:03 -0800)]
am
046d036a: am
45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
* commit '
046d036a24f624b8d30203a0e44a5fe761052c46':
Improve screen on/off logic in slideshow.
The Android Open Source Project [Wed, 30 Nov 2011 20:56:14 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:06 +0000 (10:51 -0800)]
am
764482c4: Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
* commit '
764482c4ebffc9c3cac21fcd8707811e981cd092':
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:00 +0000 (10:51 -0800)]
am
002a3fec: Fix
5686493: Crash when try to click any thumbnail
* commit '
002a3fece284f713537fad4523ee963d257350e9':
Fix
5686493: Crash when try to click any thumbnail
Daniel Sandler [Wed, 30 Nov 2011 18:50:55 +0000 (10:50 -0800)]
am
45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
* commit '
45fa677140112f725df3765be56edc715c226aa5':
Improve screen on/off logic in slideshow.
The Android Automerger [Wed, 30 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 07:56:44 +0000 (23:56 -0800)]
Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 06:32:35 +0000 (14:32 +0800)]
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
Chih-Chung Chang [Wed, 30 Nov 2011 05:19:17 +0000 (13:19 +0800)]
Fix
5686493: Crash when try to click any thumbnail
Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
Daniel Sandler [Wed, 30 Nov 2011 02:19:16 +0000 (18:19 -0800)]
Merge "Improve screen on/off logic in slideshow." into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:33:46 +0000 (13:33 -0800)]
am
e3e6a21d: am
4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
e3e6a21de63d23780c9a4cd1a56a3ff9a2c8deec':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:30:39 +0000 (13:30 -0800)]
am
4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
4e94e8858fc3187ec0eae83c70698c85115a630e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:26:56 +0000 (13:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Jeff Brown [Tue, 29 Nov 2011 21:20:18 +0000 (13:20 -0800)]
am
7b43dc54: am
881fd799: Merge "Add application launch category." into ics-mr1
* commit '
7b43dc54697d3bd576e4731b18340035b1b20c64':
Add application launch category.
Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
Jeff Brown [Tue, 29 Nov 2011 21:17:43 +0000 (13:17 -0800)]
am
881fd799: Merge "Add application launch category." into ics-mr1
* commit '
881fd799f1c54b934aa90310a54a145062264422':
Add application launch category.
Jeff Brown [Tue, 29 Nov 2011 21:14:17 +0000 (13:14 -0800)]
Merge "Add application launch category." into ics-mr1
The Android Automerger [Tue, 29 Nov 2011 20:03:31 +0000 (12:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
OSDN Git Service
