OSDN Git Service
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
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
Eric Fischer [Tue, 29 Nov 2011 19:10:53 +0000 (11:10 -0800)]
am
9db11c5f: Merge "Import revised translations."
* commit '
9db11c5f1d1f7f86f7f10df70485eec9a492b688':
Import revised translations.
Eric Fischer [Tue, 29 Nov 2011 19:07:11 +0000 (11:07 -0800)]
Merge "Import revised translations."
Eric Fischer [Tue, 29 Nov 2011 19:04:51 +0000 (11:04 -0800)]
Import revised translations.
Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
Wei Huang [Tue, 29 Nov 2011 18:07:03 +0000 (10:07 -0800)]
am
59029d5c: am
622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1
* commit '
59029d5c2fa6330a42d2bb8ab395f3a6c966e962':
Show a dialog to require updating PlusOne.
Wei Huang [Tue, 29 Nov 2011 18:04:02 +0000 (10:04 -0800)]
am
622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1
* commit '
622c2b2c7721008e7851d0af3d89d3fc545ceaf6':
Show a dialog to require updating PlusOne.
Chih-Chung Chang [Tue, 29 Nov 2011 17:59:37 +0000 (09:59 -0800)]
am
1b1e13c2: am
fc8c503d: Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
* commit '
1b1e13c2587312da8ff775c62a9b1dc7c2717e54':
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Wei Huang [Tue, 29 Nov 2011 17:58:18 +0000 (09:58 -0800)]
Merge "Show a dialog to require updating PlusOne." into ics-mr1
Chih-Chung Chang [Tue, 29 Nov 2011 17:56:48 +0000 (09:56 -0800)]
am
fc8c503d: Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
* commit '
fc8c503d1351c6ee62d233a944f2bd5220e64a55':
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Daniel Sandler [Mon, 28 Nov 2011 16:43:23 +0000 (11:43 -0500)]
Improve screen on/off logic in slideshow.
When used as a screensaver or otherwise, the slideshow
should not keep the screen on if the device is not plugged
in. It should also allow the screen to lock while the
slideshow is playing (otherwise a device left in this state
may be left unsecured for long periods by accident).
Additionally, when used as a screensaver, it must dismiss
the keyguard in order to be shown on a secured device.
Bug:
5660833
Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
Chih-Chung Chang [Tue, 29 Nov 2011 06:21:11 +0000 (14:21 +0800)]
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
Jeff Brown [Tue, 29 Nov 2011 01:23:56 +0000 (17:23 -0800)]
Add application launch category.
Bug:
5674723
Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0
The Android Automerger [Mon, 28 Nov 2011 20:22:56 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Owen Lin [Thu, 24 Nov 2011 03:59:52 +0000 (11:59 +0800)]
Show a dialog to require updating PlusOne.
Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca
fix:
5608342
The Android Open Source Project [Tue, 22 Nov 2011 21:29:35 +0000 (13:29 -0800)]
am
e4fe38b7: Reconcile with ics-mr1-release
* commit '
e4fe38b74589dbce167cd88d14b249f645a57b73':
The Android Open Source Project [Tue, 22 Nov 2011 21:26:13 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
The Android Automerger [Tue, 22 Nov 2011 19:56:44 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:16:17 +0000 (21:16 -0800)]
am
62e1828c: am
f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
62e1828c3bc2778ea07f6bf4cfb3f25681379f36':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Nov 2011 05:08:11 +0000 (21:08 -0800)]
am
f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
f36d8f299d57849a1afb1b0c271bb4be0d336e43':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:26:05 +0000 (15:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
Chih-Chung Chang [Mon, 21 Nov 2011 13:00:56 +0000 (05:00 -0800)]
am
a13f3684: am
8cbc7c4e: Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
* commit '
a13f36841cc2f6ed7f8c467ae7ff48cb57076f1d':
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Chih-Chung Chang [Mon, 21 Nov 2011 12:59:31 +0000 (04:59 -0800)]
am
8cbc7c4e: Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
* commit '
8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Chih-Chung Chang [Mon, 21 Nov 2011 12:56:35 +0000 (04:56 -0800)]
Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
The Android Open Source Project [Fri, 18 Nov 2011 23:46:38 +0000 (15:46 -0800)]
am
3ec476a0: Reconcile with ics-mr1-release
* commit '
3ec476a03bcfabdea574d7bbf352e3e46ca8bc28':
The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
Ray Chen [Fri, 18 Nov 2011 23:27:57 +0000 (15:27 -0800)]
am
6ce002de: am
00b5f3c6: Fix
5635260 Albums view goes blank after changing view option and returning to albums view
* commit '
6ce002de51161bfd10abf86c59fd05d12c696153':
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Ray Chen [Fri, 18 Nov 2011 23:23:07 +0000 (15:23 -0800)]
am
00b5f3c6: Fix
5635260 Albums view goes blank after changing view option and returning to albums view
* commit '
00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Wei Huang [Fri, 18 Nov 2011 10:42:38 +0000 (02:42 -0800)]
am
dd96bde2: am
71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1
* commit '
dd96bde27b4961e36059ede00060ae8a91096e81':
Make sure startAnimation won't be called after onPause.
Wei Huang [Fri, 18 Nov 2011 10:37:31 +0000 (02:37 -0800)]
am
71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1
* commit '
71a296c27389fefa9361adada41715ae4623af32':
Make sure startAnimation won't be called after onPause.
Chih-Chung Chang [Fri, 18 Nov 2011 10:04:10 +0000 (18:04 +0800)]
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
Ray Chen [Fri, 18 Nov 2011 07:00:32 +0000 (15:00 +0800)]
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
Wei Huang [Fri, 18 Nov 2011 00:56:49 +0000 (16:56 -0800)]
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:04 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:51:30 +0000 (05:51 -0800)]
am
74ed8bd4: am
612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
74ed8bd46dcfbf8cbc352c5cfb4f2f8df85eb8e1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Nov 2011 13:45:46 +0000 (05:45 -0800)]
am
612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
612e9d697269cff5437366ae386dea7d6af6656c':
Import revised translations. DO NOT MERGE
Owen Lin [Thu, 17 Nov 2011 07:26:56 +0000 (15:26 +0800)]
Make sure startAnimation won't be called after onPause.
Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix:
5629252
Eric Fischer [Wed, 16 Nov 2011 18:53:11 +0000 (10:53 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
The Android Automerger [Wed, 16 Nov 2011 14:46:48 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Wed, 16 Nov 2011 08:13:26 +0000 (00:13 -0800)]
am
4aaaeb86: am
d7401652: Fix
5611147 attachments (picture) can\'t be viewed after they\'re saved
* commit '
4aaaeb8625547db8432cb3a489e771ad4f2dd12e':
Fix
5611147 attachments (picture) can't be viewed after they're saved
Ray Chen [Wed, 16 Nov 2011 08:12:02 +0000 (00:12 -0800)]
am
d7401652: Fix
5611147 attachments (picture) can\'t be viewed after they\'re saved
* commit '
d74016524fa899747411240daa453e5ca9cac219':
Fix
5611147 attachments (picture) can't be viewed after they're saved
Ray Chen [Wed, 16 Nov 2011 03:12:47 +0000 (11:12 +0800)]
Fix
5611147 attachments (picture) can't be viewed after they're saved
Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
Eric Fischer [Tue, 15 Nov 2011 21:16:53 +0000 (13:16 -0800)]
am
c83b3b07: am
8ab8a64c: (-s ours) am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
c83b3b075d256346298d94d178129cfb89950cff':
Import revised translations. DO NOT MERGE
OSDN Git Service
