OSDN Git Service
Baligh Uddin [Tue, 27 Nov 2012 19:37:21 +0000 (11:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3c8f04c64c0b324c360038352304275728db26fe
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 27 Nov 2012 16:26:57 +0000 (08:26 -0800)]
am
ff53b5b9: (-s ours) am
84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
ff53b5b94f900d71cffe9fe9ae40ea860e1c79e7':
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:46:35 +0000 (07:46 -0800)]
am
17b0879f: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
17b0879f5c4ea61e49dd17756786d762dd603a72':
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
Baligh Uddin [Fri, 23 Nov 2012 05:36:22 +0000 (21:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0465a52963590018d896aec9a128d1386cf486f5
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Nov 2012 05:31:59 +0000 (21:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I05e6072f4d65c3d5240a4663880520a0c8a106ee
Auto-generated-cl: translation import
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 [Sat, 17 Nov 2012 01:27:48 +0000 (17:27 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 16 Nov 2012 23:17:38 +0000 (15:17 -0800)]
am
9a9166b3: (-s ours) am
2e5c91de: am
c0e0779f: am
c0c7418a: Import translations. DO NOT MERGE
* commit '
9a9166b3df3692d928e048aa066b89a02837ed87':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:14:49 +0000 (15:14 -0800)]
am
77e8d042: (-s ours) am
2c109fc4: am
d16c2c94: am
c6e93291: (-s ours) Import translations. DO NOT MERGE
* commit '
77e8d0426b040234d3de227dc7f2ef2e17538c2c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:14:48 +0000 (15:14 -0800)]
am
351f4af2: (-s ours) am
21f4f791: am
2ccc4259: Import translations. DO NOT MERGE
* commit '
351f4af2647304020beade93e093bdd173659b27':
Import translations. DO NOT MERGE
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:58 +0000 (15:11 -0800)]
am
90d512fb: (-s ours) am
23bfa181: Import translations. DO NOT MERGE
* commit '
90d512fb86fe709b807b754dfdb63f0ecfabf408':
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 21:25:53 +0000 (13:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I68cf8255fb19eb1147552c2d680e4e28ccf2440c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 16 Nov 2012 20:25:30 +0000 (12:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9f7450179dcbcfd95bf456f1ed79862a432baf71
Auto-generated-cl: translation import
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 18:43:13 +0000 (10:43 -0800)]
am
d2b625d6: am
b62968cc: am
5e88c747: am
18b38883: Guard tiles by synchronized block.
* commit '
d2b625d6fd20175613a1ac246aee276665a12e03':
Guard tiles by synchronized block.
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.
Baligh Uddin [Thu, 15 Nov 2012 15:43:36 +0000 (07:43 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Wed, 14 Nov 2012 20:44:59 +0000 (12:44 -0800)]
am
133ad2a8: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
133ad2a830cab9fd02d4f1be41350ac755ca0086':
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
Baligh Uddin [Wed, 14 Nov 2012 16:01:59 +0000 (08:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I510b6bb7b050b1fd24505b35a37859504af6b0c9
Auto-generated-cl: translation import
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
Baligh Uddin [Mon, 12 Nov 2012 23:54:14 +0000 (15:54 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Mon, 12 Nov 2012 15:34:12 +0000 (07:34 -0800)]
am
b9f5c914: (-s ours) am
b263fd97: am
3253b263: Reconcile with jb-mr1-release - do not merge
* commit '
b9f5c914a818d91c8eebc51d35672ca6ee2763db':
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 [Mon, 12 Nov 2012 15:25:55 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I71a7fe5a1150a6d21a318a646b19fc27b6fba130
Auto-generated-cl: translation import
Baligh Uddin [Sat, 10 Nov 2012 06:49:25 +0000 (22:49 -0800)]
am
30055612: (-s ours) am
ef1c3ee6: am
bd203347: am
8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
30055612a3442771b9856cbfac4dcd657c1ea857':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:49:24 +0000 (22:49 -0800)]
am
c7eab4da: (-s ours) am
b59213a3: am
1b488e2d: am
46281de7: Import translations. DO NOT MERGE
* commit '
c7eab4dae79a48051a2f46a166e83700963af98b':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:49:22 +0000 (22:49 -0800)]
am
26c7e0c0: (-s ours) am
cf90e2af: am
f26cba65: am
139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
26c7e0c07d05cfe13af09f0d65938fceeee4f402':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:49:21 +0000 (22:49 -0800)]
am
2b0a3c47: (-s ours) am
015b736a: am
f9121463: am
b0aae659: (-s ours) Import translations. DO NOT MERGE
* commit '
2b0a3c47daa37bf26ac14f9d79ccf6bc0fc54e68':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:49:20 +0000 (22:49 -0800)]
am
6d8ffb02: (-s ours) am
e18f667c: am
b8183269: Import translations. DO NOT MERGE
* commit '
6d8ffb023396631394a9418d9610666ea9e85b2d':
Import translations. DO NOT MERGE
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:43:58 +0000 (22:43 -0800)]
am
3f83830a: (-s ours) am
65be5095: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
3f83830aaadbf078582d9f74fb5ebb4094a96dd2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:43:57 +0000 (22:43 -0800)]
am
53e1f0ea: (-s ours) am
03392332: Import translations. DO NOT MERGE
* commit '
53e1f0eadc89ef518a556dd7ea5e66907702fec3':
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:22:04 +0000 (14:22 -0800)]
Merge "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:48 +0000 (14:20 -0800)]
Merge "Import translations. DO NOT MERGE"
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:54:13 +0000 (06:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9bc326bf4f065814e67bc55457217ae675bce878
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 14:53:31 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaff187d239a7e48d1f2e8502a339842c7f516428
Auto-generated-cl: translation import
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:50:46 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d50deb84b6c7229e003e81c14111c04ff2ae0e4
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:59:34 +0000 (15:59 -0800)]
am
5ae5e5e2: (-s ours) am
5a51d6a2: am
b7a115c7: Reconcile with jb-mr1-release - do not merge
* commit '
5ae5e5e2a9f2fe2f517749b1cfb8049e1a89577d':
John Hoford [Thu, 8 Nov 2012 23:59:33 +0000 (15:59 -0800)]
am
75495505: (-s ours) am
0ede5c51: am
4c1614b7: am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
7549550538e42a5d7e2aa791792e9818f6ed4321':
reduce size of tiny planet if malloc fails - DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 23:59:31 +0000 (15:59 -0800)]
am
4afcf0fd: (-s ours) am
286e9cd8: am
d7545049: Reconcile with jb-mr1-release - do not merge
* commit '
4afcf0fdb85a2c7fa7ffbd60312dd9569021b3fe':
Baligh Uddin [Thu, 8 Nov 2012 23:59:30 +0000 (15:59 -0800)]
am
6aea9f18: (-s ours) am
94183ec3: am
3375b227: am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6aea9f189360b9f232f8681b48a67d0c9788ae27':
Import translations. DO NOT MERGE
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
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':
OSDN Git Service
