OSDN Git Service
nicolasroard [Thu, 29 Nov 2012 06:20:56 +0000 (22:20 -0800)]
am
466f3d9b: am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
466f3d9b854b8206e0e543f187952c39ae253ce8':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:19:10 +0000 (22:19 -0800)]
am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:14:20 +0000 (22:14 -0800)]
Fix potential crash
(regression introduced with fix for
7406402)
bug:
7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
nicolasroard [Thu, 29 Nov 2012 06:03:00 +0000 (22:03 -0800)]
am
33a487f6: am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
33a487f6698078a27e4a03c10f1201ee62a4dc7c':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 06:01:00 +0000 (22:01 -0800)]
am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 05:50:46 +0000 (21:50 -0800)]
Set crop ratio to unconstrained by default.
bug:
7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
nicolasroard [Thu, 29 Nov 2012 05:29:15 +0000 (21:29 -0800)]
am
83705e99: am
205d0cdf: Fix overdraw the correct way...
* commit '
83705e99a84fa941ce5dcc7488b69d55df8c7105':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:27:31 +0000 (21:27 -0800)]
am
205d0cdf: Fix overdraw the correct way...
* commit '
205d0cdf0590bc1156a1d7fff1d0811d142de4a6':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:20:37 +0000 (21:20 -0800)]
Fix overdraw the correct way...
bug:
7634701
Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
nicolasroard [Thu, 29 Nov 2012 05:03:26 +0000 (21:03 -0800)]
am
85135c1b: am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
85135c1b580c922866965c5fb069ba69f2e76b28':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:02:19 +0000 (21:02 -0800)]
am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:01:47 +0000 (21:01 -0800)]
am
b25cb646: am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
b25cb64654eda734fef66a4706a4ee8e51e374a3':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 05:00:30 +0000 (21:00 -0800)]
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 05:00:19 +0000 (21:00 -0800)]
am
69a77e9e: am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
69a77e9e8a34806615e4a04303a65b4782473dd6':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 05:00:06 +0000 (21:00 -0800)]
am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
68e4ae64380e2c9843faaec63b98ba51479c0f11':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 04:58:35 +0000 (20:58 -0800)]
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:57:56 +0000 (20:57 -0800)]
am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)]
Merge "Add new borders assets" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:55:32 +0000 (20:55 -0800)]
am
a12b3542: am
cd84d676: Fix history panel overlap
* commit '
a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:31:59 +0000 (19:31 -0800)]
Add new borders assets
bug:
7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
nicolasroard [Thu, 29 Nov 2012 04:54:47 +0000 (20:54 -0800)]
am
cd84d676: Fix history panel overlap
* commit '
cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)]
Fix history panel overlap
bug:
7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
nicolasroard [Thu, 29 Nov 2012 03:11:42 +0000 (19:11 -0800)]
Fix overdraw in FilterShow activity
bug:
7634701
Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
nicolasroard [Thu, 29 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Fix flashing in geometry panel
bug:
7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
nicolasroard [Thu, 29 Nov 2012 01:23:58 +0000 (17:23 -0800)]
am
e4b3e7a8: am
987bc8aa: Fix wrong colors in Curves
* commit '
e4b3e7a8240ac284e33d04eac00800d3e6e96cc8':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:22:11 +0000 (17:22 -0800)]
am
987bc8aa: Fix wrong colors in Curves
* commit '
987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:21:35 +0000 (17:21 -0800)]
am
e0a22a0b: am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
e0a22a0b12741680000b0570e0940d6602ddf003':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:20:03 +0000 (17:20 -0800)]
am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:09:59 +0000 (17:09 -0800)]
Fix wrong colors in Curves
bug:
7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
nicolasroard [Thu, 29 Nov 2012 01:17:35 +0000 (17:17 -0800)]
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:07:17 +0000 (17:07 -0800)]
am
17b8c517: am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
17b8c5174410b09ddeb4cdd0b50468a4bbab450c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:05:53 +0000 (17:05 -0800)]
am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:04:48 +0000 (17:04 -0800)]
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
John Hoford [Thu, 29 Nov 2012 00:59:42 +0000 (16:59 -0800)]
am
a8a9c933: am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
a8a9c93313ad8fa42b364e7661211a2483b9a957':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:57:43 +0000 (16:57 -0800)]
am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:56:20 +0000 (16:56 -0800)]
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 00:35:47 +0000 (16:35 -0800)]
Fix moving points in the Curves editor
bug:
7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
nicolasroard [Wed, 28 Nov 2012 23:59:09 +0000 (15:59 -0800)]
am
c22c429d: am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
c22c429ddebbf7f4db71ff5c0b94c7bd5f8aa63c':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:57:28 +0000 (15:57 -0800)]
am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:56:07 +0000 (15:56 -0800)]
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
Ruben Brunk [Fri, 16 Nov 2012 21:51:08 +0000 (13:51 -0800)]
Added locking to ImageLoader.
Bug:
7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
Ruben Brunk [Wed, 28 Nov 2012 23:48:04 +0000 (15:48 -0800)]
am
9dd37b67: am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
9dd37b67274b9ea68a06abfd0678d2fdcd596dab':
Minor fix for some FP rounding errors in crop.
Ruben Brunk [Wed, 28 Nov 2012 23:46:18 +0000 (15:46 -0800)]
am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
Ruben Brunk [Wed, 28 Nov 2012 00:13:32 +0000 (16:13 -0800)]
Minor fix for some FP rounding errors in crop.
Bug
7566505
Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
Your Name [Tue, 27 Nov 2012 23:45:25 +0000 (15:45 -0800)]
am
a938efc8: am
3c6a0610: Remove orientation compensation
* commit '
a938efc8bd7ea589f74f247480db6909f2bbb835':
Remove orientation compensation
Your Name [Tue, 27 Nov 2012 23:43:05 +0000 (15:43 -0800)]
am
3c6a0610: Remove orientation compensation
* commit '
3c6a0610d50a866e520485163011c79d9ee62457':
Remove orientation compensation
Your Name [Tue, 27 Nov 2012 00:33:49 +0000 (16:33 -0800)]
Remove orientation compensation
Bug:
7446056
Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
Baligh Uddin [Fri, 16 Nov 2012 23:11:31 +0000 (15:11 -0800)]
am
c0e0779f: am
c0c7418a: Import translations. DO NOT MERGE
* commit '
c0e0779f92e2fc714e0f5627e896581b62e82ad7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:09:06 +0000 (15:09 -0800)]
am
d16c2c94: am
c6e93291: (-s ours) Import translations. DO NOT MERGE
* commit '
d16c2c94d5260250de719841fd9bc3f54a4afd82':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:09:05 +0000 (15:09 -0800)]
am
2ccc4259: Import translations. DO NOT MERGE
* commit '
2ccc425996d47433ad7d0320c27f9c76a7dafd2d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:08:45 +0000 (15:08 -0800)]
am
c0c7418a: Import translations. DO NOT MERGE
* commit '
c0c7418a7275131786a296c006864fcca3b559e9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:06:57 +0000 (15:06 -0800)]
am
c6e93291: (-s ours) Import translations. DO NOT MERGE
* commit '
c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 20:25:04 +0000 (12:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I76cccdd7c79efdc991b2f5e560190588d676e36e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:24:38 +0000 (12:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I29a06b074154db39f5ad21cb3ddcbfb556e4fd60
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:24:15 +0000 (12:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic833e12115b687b41861b9f43c91bf700af2dd66
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:22:59 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie207a187da4dcd2212b987ec47e1faf24542ae08
Auto-generated-cl: translation import
Angus Kong [Fri, 16 Nov 2012 02:21:06 +0000 (18:21 -0800)]
am
5e88c747: am
18b38883: Guard tiles by synchronized block.
* commit '
5e88c7475c3e1eb30fe986793960d810a1748140':
Guard tiles by synchronized block.
Angus Kong [Fri, 16 Nov 2012 02:19:07 +0000 (18:19 -0800)]
am
18b38883: Guard tiles by synchronized block.
* commit '
18b388839ed9858a3b35cec9a636e5cde58a528a':
Guard tiles by synchronized block.
Angus Kong [Wed, 14 Nov 2012 09:11:10 +0000 (17:11 +0800)]
Guard tiles by synchronized block.
Tiles might be touched in different threads.
bug:
7490351
Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
The Android Open Source Project [Mon, 12 Nov 2012 15:28:33 +0000 (07:28 -0800)]
am
3253b263: Reconcile with jb-mr1-release - do not merge
* commit '
3253b263b03d3ffd9b70224d2c59c082e6dc0c58':
The Android Open Source Project [Mon, 12 Nov 2012 15:26:28 +0000 (07:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If2e420d2351705c4bcb89c0787951f431ebdd56d
Baligh Uddin [Sat, 10 Nov 2012 06:41:45 +0000 (22:41 -0800)]
am
bd203347: am
8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
bd2033475fb3226fa7a6158ac4cb4ed1f7b87fc7':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:41:44 +0000 (22:41 -0800)]
am
1b488e2d: am
46281de7: Import translations. DO NOT MERGE
* commit '
1b488e2d3051cc87715365b49713e6b15cfb1401':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:41:43 +0000 (22:41 -0800)]
am
f26cba65: am
139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
f26cba658abed9f0bfdd37131e3b6fadcfb7bd82':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:41:42 +0000 (22:41 -0800)]
am
f9121463: am
b0aae659: (-s ours) Import translations. DO NOT MERGE
* commit '
f9121463776a173c492bf699a130492648df63a2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:41:41 +0000 (22:41 -0800)]
am
b8183269: Import translations. DO NOT MERGE
* commit '
b818326915c27a3857eb77b2ad660f7b6e99fb5e':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 10 Nov 2012 00:25:40 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Fri, 9 Nov 2012 23:24:54 +0000 (15:24 -0800)]
am
8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8182ed32d7dac4209086b6f33843167291a5aa77':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 23:24:53 +0000 (15:24 -0800)]
am
46281de7: Import translations. DO NOT MERGE
* commit '
46281de7f9d1fd32f20598efd31e7a8f2e7c2ac3':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 22:21:53 +0000 (14:21 -0800)]
am
139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
139efdbcd66d718b0d24d42e2ea18432469ac005':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 22:21:53 +0000 (14:21 -0800)]
am
b0aae659: (-s ours) Import translations. DO NOT MERGE
* commit '
b0aae659bdc27af5dbe460541f3e9843fc815b1f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:48:20 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 22:20:08 +0000 (14:20 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 9 Nov 2012 22:19:44 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Fri, 9 Nov 2012 22:19:12 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 9 Nov 2012 14:52:46 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib95894d56a16d3c7ec01b84d7b1ed57ea44d33aa
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:52:23 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I39f23219e3e9794e24656c944ab5b0ba2386e760
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:51:36 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:49:53 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4e9f92985c3e2285d1bb280560fa7fe86bee972f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:49:19 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I839d902c45e0c149f497188d5976700afb45e1b4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:48:20 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 8 Nov 2012 22:22:22 +0000 (14:22 -0800)]
am
b7a115c7: Reconcile with jb-mr1-release - do not merge
* commit '
b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75':
The Android Open Source Project [Thu, 8 Nov 2012 22:19:21 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
The Android Automerger [Thu, 8 Nov 2012 21:54:14 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
John Hoford [Thu, 8 Nov 2012 20:06:25 +0000 (12:06 -0800)]
am
4c1614b7: am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
4c1614b7845252209742411acd09723e2245b8f8':
reduce size of tiny planet if malloc fails - DO NOT MERGE
John Hoford [Thu, 8 Nov 2012 20:04:26 +0000 (12:04 -0800)]
am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
8253c35a5d9564afbc667f7a9f42fdc0a734bcf8':
reduce size of tiny planet if malloc fails - DO NOT MERGE
John Hoford [Thu, 8 Nov 2012 18:41:24 +0000 (10:41 -0800)]
reduce size of tiny planet if malloc fails - DO NOT MERGE
bug:
7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
John Hoford [Thu, 8 Nov 2012 18:41:24 +0000 (10:41 -0800)]
reduce size of tiny planet if malloc fails
bug:
7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
The Android Open Source Project [Thu, 8 Nov 2012 16:58:02 +0000 (08:58 -0800)]
am
d7545049: Reconcile with jb-mr1-release - do not merge
* commit '
d7545049bfe7142389eae84394d6b76ed9b68fb2':
The Android Open Source Project [Thu, 8 Nov 2012 16:54:32 +0000 (08:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
The Android Automerger [Wed, 7 Nov 2012 21:06:04 +0000 (13:06 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:42:37 +0000 (11:42 -0800)]
am
3375b227: am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
3375b2274ce109fbe8f8d1804655a9eadaa067a0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:38:49 +0000 (11:38 -0800)]
am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2a8405d7e5439e1098598f47081530c550733f12':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:37:05 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Wed, 7 Nov 2012 18:24:20 +0000 (10:24 -0800)]
am
5636617c: Reconcile with jb-mr1-release - do not merge
* commit '
5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a':
The Android Open Source Project [Wed, 7 Nov 2012 18:20:11 +0000 (10:20 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b
The Android Automerger [Wed, 7 Nov 2012 02:04:20 +0000 (18:04 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 00:12:07 +0000 (16:12 -0800)]
am
a6bb1711: am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a6bb17113d7e0cc8e3299b6838afe40f88aff41d':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:12:06 +0000 (16:12 -0800)]
am
75bf0030: am
88571794: am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
75bf003033dc9c0131a9669e8d7d9ebc51ec2dc8':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Wed, 7 Nov 2012 00:09:05 +0000 (16:09 -0800)]
am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
da700ab4ded11912e96606b2a0df3199bdbeb9d5':
Import translations. DO NOT MERGE
OSDN Git Service
