OSDN Git Service
nicolasroard [Thu, 29 Nov 2012 22:26:16 +0000 (14:26 -0800)]
am
db8647e9: am
e4b3e7a8: am
987bc8aa: Fix wrong colors in Curves
* commit '
db8647e9d655cd620cc1f2b6a2535608867dcae2':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 22:26:15 +0000 (14:26 -0800)]
am
ae2408be: am
e0a22a0b: am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
ae2408bedcdea7e9a8bb35e1f7a75611ac19948d':
Fix moving points in the Curves editor
Ruben Brunk [Thu, 29 Nov 2012 22:26:11 +0000 (14:26 -0800)]
am
e88e1fac: am
17b8c517: am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
e88e1fac86517a733669c5766f9cc78845978e8b':
Added locking to ImageLoader.
John Hoford [Thu, 29 Nov 2012 22:26:10 +0000 (14:26 -0800)]
am
060060d5: am
a8a9c933: am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
060060d5ead8abca617129e0a79165cda956947a':
reduce size of tiny planet if malloc fails
nicolasroard [Thu, 29 Nov 2012 22:25:56 +0000 (14:25 -0800)]
am
b6eca977: am
c22c429d: am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
b6eca977059bad80044e3c2a8b44b93d9df992bb':
Add a triangle to the popup button view
Ruben Brunk [Thu, 29 Nov 2012 22:25:50 +0000 (14:25 -0800)]
am
67109bef: am
9dd37b67: am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
67109befa39ad83b0e1f12cba6d393042d9a29e3':
Minor fix for some FP rounding errors in crop.
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:47:28 +0000 (15:47 -0800)]
am
4c91e7c4: am
a938efc8: am
3c6a0610: Remove orientation compensation
* commit '
4c91e7c4e9e9de211f8d0b7844eaed1d7cbe2b94':
Remove orientation compensation
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
The Android Open Source Project [Tue, 27 Nov 2012 16:24:24 +0000 (08:24 -0800)]
am
84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
84c2777a07f9b3d10ee7f7c4c01c97e1ec737acf':
The Android Open Source Project [Tue, 27 Nov 2012 16:21:33 +0000 (08:21 -0800)]
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I9d78e7dd4f410c331a920294d9375118cc43a007
The Android Open Source Project [Tue, 27 Nov 2012 15:43:34 +0000 (07:43 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I499b518412a7bd7fda77560aed8f66a798013cd1
The Android Automerger [Tue, 20 Nov 2012 00:13:27 +0000 (16:13 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Fri, 16 Nov 2012 23:14:21 +0000 (15:14 -0800)]
am
2e5c91de: am
c0e0779f: am
c0c7418a: Import translations. DO NOT MERGE
* commit '
2e5c91dedfbb31a869bff9ead9bdffa61d8cd0cd':
Import translations. DO NOT MERGE
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:11:28 +0000 (15:11 -0800)]
am
2c109fc4: am
d16c2c94: am
c6e93291: (-s ours) Import translations. DO NOT MERGE
* commit '
2c109fc4f196ffd7aae59f949382f99b47f43a61':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:11:27 +0000 (15:11 -0800)]
am
21f4f791: am
2ccc4259: Import translations. DO NOT MERGE
* commit '
21f4f791eb8152566aced0707bf0e585229474a6':
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:08:27 +0000 (15:08 -0800)]
am
23bfa181: Import translations. DO NOT MERGE
* commit '
23bfa181f8cafe32d5bc06a97b07049fc4b3200d':
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
The Android Automerger [Fri, 16 Nov 2012 19:29:47 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Angus Kong [Fri, 16 Nov 2012 02:23:32 +0000 (18:23 -0800)]
am
b62968cc: am
5e88c747: am
18b38883: Guard tiles by synchronized block.
* commit '
b62968cc1f7637dc3392931122dcdbbdf07b75e6':
Guard tiles by synchronized block.
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.
The Android Open Source Project [Wed, 14 Nov 2012 20:41:22 +0000 (12:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ibc614d3e84ca8542758885e300b25263b2f9496e
The Android Automerger [Wed, 14 Nov 2012 19:28:51 +0000 (11:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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:31:13 +0000 (07:31 -0800)]
am
b263fd97: am
3253b263: Reconcile with jb-mr1-release - do not merge
* commit '
b263fd97087ef7aba761397246124e4fcf3a4f2f':
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:45:20 +0000 (22:45 -0800)]
am
ef1c3ee6: am
bd203347: am
8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
ef1c3ee6ef666d2d802273d896cf1dd24394e4bc':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:45:19 +0000 (22:45 -0800)]
am
b59213a3: am
1b488e2d: am
46281de7: Import translations. DO NOT MERGE
* commit '
b59213a3cfffe98299d2bc9a653f1a3a1239bfe9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:45:18 +0000 (22:45 -0800)]
am
cf90e2af: am
f26cba65: am
139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
cf90e2af87d1d76685f3825972899bc086652071':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:45:17 +0000 (22:45 -0800)]
am
015b736a: am
f9121463: am
b0aae659: (-s ours) Import translations. DO NOT MERGE
* commit '
015b736a58fd62d8a8a07f1a228aab29c5d42300':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:45:15 +0000 (22:45 -0800)]
am
e18f667c: am
b8183269: Import translations. DO NOT MERGE
* commit '
e18f667cf96db59f30c50422fea6ea5e19d64055':
Import translations. DO NOT MERGE
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 23:16:59 +0000 (15:16 -0800)]
am
65be5095: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
65be50950bde081642f9cd83fb439c2c645ae719':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 23:16:58 +0000 (15:16 -0800)]
am
03392332: Import translations. DO NOT MERGE
* commit '
033923329a0366ccd37891ef9552d6f4f986d28d':
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 23:47:53 +0000 (15:47 -0800)]
am
5a51d6a2: am
b7a115c7: Reconcile with jb-mr1-release - do not merge
* commit '
5a51d6a23d7e2ab7fabcc88e71cd59454b692d09':
John Hoford [Thu, 8 Nov 2012 23:45:18 +0000 (15:45 -0800)]
am
0ede5c51: am
4c1614b7: am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
0ede5c513d0c37c26f921b9e1ef25eb04b1f383b':
reduce size of tiny planet if malloc fails - DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 23:44:34 +0000 (15:44 -0800)]
am
286e9cd8: am
d7545049: Reconcile with jb-mr1-release - do not merge
* commit '
286e9cd80827518e75de282fd88f1352656a7a6d':
Baligh Uddin [Thu, 8 Nov 2012 23:42:28 +0000 (15:42 -0800)]
am
94183ec3: am
3375b227: am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
94183ec33f6a99069976236a7090d9f26e262e28':
Import translations. DO NOT MERGE
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 Open Source Project [Thu, 8 Nov 2012 14:27:05 +0000 (06:27 -0800)]
am
486ac238: am
5636617c: Reconcile with jb-mr1-release - do not merge
* commit '
486ac23882dcca5998a8914f3f80e2597537ffd9':
Baligh Uddin [Thu, 8 Nov 2012 14:13:57 +0000 (06:13 -0800)]
am
ab003a08: am
a6bb1711: am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ab003a084049320807f72341fa260ae133c13c73':
Import translations. DO NOT MERGE
Bobby Georgescu [Thu, 8 Nov 2012 14:13:56 +0000 (06:13 -0800)]
am
c06e9eab: am
75bf0030: am
88571794: am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
c06e9eab7510549b87935b3c1179cfa6f3f78819':
Fix scenario where launching Gallery launches Camera
OSDN Git Service
