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

OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / log

commit | commitdiff | tree

Eric Fischer [Wed, 8 Feb 2012 21:06:28 +0000 (13:06 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib49ea69bac5f27840a1e542a5e0946c09a1d264c

commit | commitdiff | tree

Eric Fischer [Tue, 7 Feb 2012 18:32:33 +0000 (10:32 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ic559edd4271ee14e03a8435c4b52232e18e68d3b

commit | commitdiff | tree

Eric Fischer [Mon, 6 Feb 2012 20:11:02 +0000 (12:11 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ia770f26d04147c896cf3a6af0f2a2a5eabe23694

commit | commitdiff | tree

Pin Ting [Mon, 6 Feb 2012 06:24:13 +0000 (22:24 -0800)]

Merge "Shows status bar in gallery when in portrait view."

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Fri, 3 Feb 2012 19:59:47 +0000 (11:59 -0800)]

Import translations. DO NOT MERGE

Change-Id: I35f3f1aa3dac1e55f3e15edbdf9b426d9967bb4f

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Thu, 2 Feb 2012 20:05:26 +0000 (12:05 -0800)]

Import translations. DO NOT MERGE

Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Tue, 31 Jan 2012 19:14:48 +0000 (11:14 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c

commit | commitdiff | tree

Eric Fischer [Mon, 30 Jan 2012 22:50:09 +0000 (14:50 -0800)]

Import translations. DO NOT MERGE

Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9

commit | commitdiff | tree

Eric Fischer [Thu, 26 Jan 2012 22:08:45 +0000 (14:08 -0800)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Thu, 26 Jan 2012 22:08:32 +0000 (14:08 -0800)]

Import translations. DO NOT MERGE

Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a

commit | commitdiff | tree

Eric Fischer [Thu, 26 Jan 2012 21:45:09 +0000 (13:45 -0800)]

Import translations. DO NOT MERGE

Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df

commit | commitdiff | tree

Eric Fischer [Thu, 29 Dec 2011 20:18:49 +0000 (12:18 -0800)]

Import revised translations.

Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Yuli Huang [Fri, 2 Dec 2011 08:09:00 +0000 (00:09 -0800)]

Merge "Refactor to remove obsolete design and improve code consistency."

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Wed, 30 Nov 2011 20:56:14 +0000 (12:56 -0800)]

Reconcile with ics-mr1-release

Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]

Import revised translations. DO NOT MERGE

Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:04:51 +0000 (11:04 -0800)]

Import revised translations.

Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]

Import revised translations. DO NOT MERGE

Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81

commit | commitdiff | tree

The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]

Reconcile with ics-mr1-release

Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]

Import revised translations. DO NOT MERGE

Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Tue, 15 Nov 2011 21:11:10 +0000 (13:11 -0800)]

am 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE

* commit '8ab8a64cc40a683d364829aad404fea4548cbd48':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Yuli Huang [Tue, 15 Nov 2011 21:06:55 +0000 (13:06 -0800)]

am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1

* commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/5517002 by dismissing running progress dialog in onPause().

commit | commitdiff | tree

Eric Fischer [Tue, 15 Nov 2011 20:19:48 +0000 (12:19 -0800)]

am 756f9bc7: Import revised translations. DO NOT MERGE

* commit '756f9bc72468a6fba926602b86525aed7bb05b40':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Yuli Huang [Mon, 14 Nov 2011 14:38:16 +0000 (22:38 +0800)]

Fix b/5517002 by dismissing running progress dialog in onPause().

Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a

commit | commitdiff | tree

Eric Fischer [Mon, 14 Nov 2011 21:32:51 +0000 (13:32 -0800)]

Import revised translations. DO NOT MERGE

Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2

commit | commitdiff | tree

The Android Automerger [Sun, 13 Nov 2011 14:47:17 +0000 (06:47 -0800)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Ray Chen [Fri, 11 Nov 2011 19:48:32 +0000 (11:48 -0800)]

am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1

* commit 'c9af80a1e46106b93271903753d36682b480479c':
Fix 5213252 [UI] Updated action bar layouts and action orders

commit | commitdiff | tree

Ray Chen [Fri, 11 Nov 2011 07:33:43 +0000 (23:33 -0800)]

Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1

commit | commitdiff | tree

Yuli Huang [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]

am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1

* commit 'e193bc40110b0606806c864234e95141be6bd312':
Fix b/5518211 by disabling effects when photo cannot be loaded.

commit | commitdiff | tree

Eric Fischer [Thu, 10 Nov 2011 23:01:57 +0000 (15:01 -0800)]

Merge "Import revised translations."

commit | commitdiff | tree

The Android Open Source Project [Thu, 10 Nov 2011 22:36:29 +0000 (14:36 -0800)]

Reconcile with ics-mr1-release

Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd

commit | commitdiff | tree

Eric Fischer [Thu, 10 Nov 2011 22:12:56 +0000 (14:12 -0800)]

Import revised translations.

Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf

commit | commitdiff | tree

Ray Chen [Wed, 9 Nov 2011 02:49:09 +0000 (10:49 +0800)]

Fix 5213252 [UI] Updated action bar layouts and action orders

Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc

commit | commitdiff | tree

Yuli Huang [Thu, 10 Nov 2011 08:50:31 +0000 (16:50 +0800)]

Fix b/5518211 by disabling effects when photo cannot be loaded.

Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335

commit | commitdiff | tree

Yuli Huang [Tue, 8 Nov 2011 18:49:14 +0000 (18:49 +0000)]

am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1

* commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery

commit | commitdiff | tree

The Android Automerger [Tue, 8 Nov 2011 14:46:22 +0000 (06:46 -0800)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Yuli Huang [Tue, 8 Nov 2011 03:58:36 +0000 (19:58 -0800)]

Merge "Add face tanning effect to gallery" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]

am 826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 7 Nov 2011 20:36:26 +0000 (12:36 -0800)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Mon, 7 Nov 2011 20:26:25 +0000 (12:26 -0800)]

Import revised translations. DO NOT MERGE

Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c

commit | commitdiff | tree

Wei Huang [Mon, 7 Nov 2011 18:57:34 +0000 (18:57 +0000)]

am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1

* commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2':
Change OK to CROP fro CropImage.

commit | commitdiff | tree

The Android Open Source Project [Mon, 7 Nov 2011 16:31:56 +0000 (08:31 -0800)]

Reconcile with ics-mr1-release

Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329

commit | commitdiff | tree

Owen Lin [Mon, 7 Nov 2011 10:09:51 +0000 (18:09 +0800)]

Change OK to CROP fro CropImage.

fix: 5199444

Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc

commit | commitdiff | tree

The Android Automerger [Sun, 6 Nov 2011 14:46:37 +0000 (06:46 -0800)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Ruei-sung Lin [Fri, 14 Oct 2011 01:20:07 +0000 (18:20 -0700)]

Add face tanning effect to gallery

bug: 5453164

Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c

commit | commitdiff | tree

The Android Open Source Project [Fri, 4 Nov 2011 15:31:35 +0000 (08:31 -0700)]

Reconcile with ics-mr1-release

Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19

commit | commitdiff | tree

Chih-Chung Chang [Thu, 3 Nov 2011 16:43:42 +0000 (16:43 +0000)]

am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1

* commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133':
Fix 5543077: Gallery UI tweaks.

commit | commitdiff | tree

Chih-Chung Chang [Thu, 3 Nov 2011 16:40:39 +0000 (09:40 -0700)]

Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 13:44:37 +0000 (06:44 -0700)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Chih-Chung Chang [Thu, 3 Nov 2011 11:25:58 +0000 (19:25 +0800)]

Fix 5543077: Gallery UI tweaks.

Change-Id: I0b85b37ba851628acd0853e4de0985b494606487

commit | commitdiff | tree

Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]

am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1

* commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6':
Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing

commit | commitdiff | tree

Ray Chen [Thu, 3 Nov 2011 10:04:14 +0000 (03:04 -0700)]

Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Thu, 3 Nov 2011 00:43:25 +0000 (00:43 +0000)]

am e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations. DO NOT MERGE

* commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 3 Nov 2011 00:04:24 +0000 (00:04 +0000)]

am 82635d92: (-s ours) Import revised translations. DO NOT MERGE

* commit '82635d92bc0f2186da650a00fa458d1c542e2ec9':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 22:17:50 +0000 (15:17 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 21:13:37 +0000 (14:13 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 17:31:30 +0000 (17:31 +0000)]

am d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'd1e3e97606b850022cced61bafb50a1989b76d15':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 17:22:58 +0000 (10:22 -0700)]

Import revised translations.

Change-Id: Iabba637909aec27731a7a991b3b8540da1c9b957

commit | commitdiff | tree

The Android Automerger [Wed, 2 Nov 2011 13:46:36 +0000 (06:46 -0700)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Eric Fischer [Tue, 1 Nov 2011 20:36:36 +0000 (13:36 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f

commit | commitdiff | tree

The Android Open Source Project [Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)]

Reconcile with ics-mr1-release

Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e

commit | commitdiff | tree

Eric Fischer [Mon, 31 Oct 2011 12:26:47 +0000 (12:26 +0000)]

am 9c1fecf0: (-s ours) am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE

* commit '9c1fecf0a6e2325f72f56ba32bd0703314e0ef30':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Automerger [Sun, 30 Oct 2011 13:47:42 +0000 (06:47 -0700)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Eric Fischer [Sat, 29 Oct 2011 03:15:31 +0000 (03:15 +0000)]

am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE

* commit '8e10103fa8010a6756182a9a14c7504254dda36a':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Sat, 29 Oct 2011 00:05:39 +0000 (17:05 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I838ee08834a0ab535519aa5886fb8593e49f59fc

commit | commitdiff | tree

Eric Fischer [Fri, 28 Oct 2011 22:27:58 +0000 (22:27 +0000)]

am eb9aa98a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'eb9aa98ad005f2accbc4f9566e49d685d2213493':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 28 Oct 2011 21:00:52 +0000 (14:00 -0700)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Fri, 28 Oct 2011 20:53:13 +0000 (13:53 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I76f98594896d654584cfa3d75a56264906837e46

commit | commitdiff | tree

Eric Fischer [Fri, 28 Oct 2011 19:14:11 +0000 (12:14 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Eric Fischer [Fri, 28 Oct 2011 18:24:34 +0000 (11:24 -0700)]

Import revised translations.

Change-Id: Ib3f108fe3ad63e2621e439893494a48348a6b2ec

commit | commitdiff | tree

Claudia de Veaux [Fri, 28 Oct 2011 04:39:34 +0000 (21:39 -0700)]

Merge "Edits to newly-added error messages, per UI text standards. Bugs: 5165745, 5162668"

commit | commitdiff | tree

Ray Chen [Fri, 28 Oct 2011 04:01:49 +0000 (12:01 +0800)]

Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing

Change-Id: Icd160f688496c5e9e70c13889e9e393cad0dc428

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 21:54:12 +0000 (21:54 +0000)]

am 1f7c6c68: (-s ours) am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE

* commit '1f7c6c68c3e7d416d37ab3ce7d5ade86c0f899b1':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 21:46:48 +0000 (21:46 +0000)]

am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE

* commit 'cceae7e79d7a795c6007170c174930061e0654a7':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Claudia de Veaux [Thu, 27 Oct 2011 20:41:33 +0000 (13:41 -0700)]

Edits to newly-added error messages, per UI text standards.
Bugs: 5165745, 5162668

Change-Id: I935ea51e608ef1941296f140878fc5146d12aa25

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 16:52:22 +0000 (09:52 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I67c4dc34f67192f714172fbc5a82ff7cb8b81ff2

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 16:51:07 +0000 (16:51 +0000)]

am 748e7efc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '748e7efccccb61e8ce9e9ac86a6f2c8987bbcefb':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 16:45:19 +0000 (09:45 -0700)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

The Android Automerger [Thu, 27 Oct 2011 13:47:20 +0000 (06:47 -0700)]

merge in ics-mr1-release history after reset to ics-mr1

commit | commitdiff | tree

Eric Fischer [Thu, 27 Oct 2011 00:40:16 +0000 (17:40 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ie311a298b5510a50728d61117a3855a866291ca4

commit | commitdiff | tree

Eric Fischer [Wed, 26 Oct 2011 21:14:56 +0000 (21:14 +0000)]

am b633e313: (-s ours) am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit 'b633e313820d725f7f56fe016494796a2413c549':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 26 Oct 2011 21:08:54 +0000 (21:08 +0000)]

am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit '0e711f17ec4252457453f8b9507aabc2a886d6d6':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 26 Oct 2011 18:34:23 +0000 (18:34 +0000)]

am 1e7b81dc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '1e7b81dcd0bf9b6a2bd90fc5895437656725ea34':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 26 Oct 2011 18:07:45 +0000 (11:07 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I078484fe3bb63f021b35d935e864604681265fe4

commit | commitdiff | tree

Eric Fischer [Wed, 26 Oct 2011 17:21:43 +0000 (10:21 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I4da74b8d117cfc2336730179daa364b800e73f23

commit | commitdiff | tree

Ed Heyl [Wed, 26 Oct 2011 14:57:59 +0000 (14:57 +0000)]

am 2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '2015a3c36930045d6268871e9c6907533d863702':

commit | commitdiff | tree

The Android Automerger [Wed, 26 Oct 2011 14:05:32 +0000 (07:05 -0700)]

merge in ics-mr1-release history after reset to ics-mr1