The Android Open Source Project
|
a714c33d2f
|
am 2fb2c487: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '2fb2c487c13340e0384aec1514ebe56617f397a7':
|
2012-11-28 09:49:33 -08:00 |
|
The Android Open Source Project
|
2fb2c487c1
|
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I81ef334240c928353194c517a94bf5e052b54322
|
2012-11-28 09:47:52 -08:00 |
|
John Spurlock
|
b18661d334
|
am fb503530: am 28c116f0: am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
* commit 'fb50353037c20242ffa1b800c8e983dbfe94ad48':
Update a few dream setting strings to ease translation.
|
2012-11-28 06:35:32 -08:00 |
|
John Spurlock
|
fb50353037
|
am 28c116f0: am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
* commit '28c116f0c22c8a31a4053fa72a73eaa0f4cbf30e':
Update a few dream setting strings to ease translation.
|
2012-11-28 06:33:53 -08:00 |
|
John Spurlock
|
28c116f0c2
|
am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
* commit 'fc4be3856f6e1cd47da742a2a30b322979a9ebd0':
Update a few dream setting strings to ease translation.
|
2012-11-28 06:31:50 -08:00 |
|
John Spurlock
|
fc4be3856f
|
Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
|
2012-11-28 06:30:29 -08:00 |
|
Baligh Uddin
|
3b63732a07
|
am b3724b30: (-s ours) am abd5b596: am 3236571f: am 42db418f: Import translations. DO NOT MERGE
* commit 'b3724b305cce8db2d0b4be7afe18ab5296faa26e':
Import translations. DO NOT MERGE
|
2012-11-27 18:43:20 -08:00 |
|
Baligh Uddin
|
4c32388f15
|
am d8cd1eda: (-s ours) am 234ac63b: am 1e9f8d6f: Import translations. DO NOT MERGE
* commit 'd8cd1eda78dfaf37266c33267f5e805bd42d16a6':
Import translations. DO NOT MERGE
|
2012-11-27 18:43:19 -08:00 |
|
Baligh Uddin
|
fb700175bd
|
am 45076f8e: (-s ours) am 20fbdbf1: Import translations. DO NOT MERGE
* commit '45076f8eb1a3729fbf7d2c8abf1a7a53d4b76953':
Import translations. DO NOT MERGE
|
2012-11-27 18:43:15 -08:00 |
|
The Android Automerger
|
1abbe83607
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-11-27 15:34:56 -08:00 |
|
Baligh Uddin
|
b3724b305c
|
am abd5b596: am 3236571f: am 42db418f: Import translations. DO NOT MERGE
* commit 'abd5b596febe7c1920ce8f46e0e3355dd44a0b99':
Import translations. DO NOT MERGE
|
2012-11-27 14:26:47 -08:00 |
|
Baligh Uddin
|
d8cd1eda78
|
am 234ac63b: am 1e9f8d6f: Import translations. DO NOT MERGE
* commit '234ac63beae7ea8d6612ab31ad7afc907d9d1c7b':
Import translations. DO NOT MERGE
|
2012-11-27 14:26:46 -08:00 |
|
Baligh Uddin
|
b9ca26f30d
|
Import translations. DO NOT MERGE
Change-Id: I184b92d6117176a6afd081aa903c1892354a8d94
Auto-generated-cl: translation import
|
2012-11-27 14:24:55 -08:00 |
|
Baligh Uddin
|
abd5b596fe
|
am 3236571f: am 42db418f: Import translations. DO NOT MERGE
* commit '3236571f4551bf20c4651ed9bc46380cd3ff8d67':
Import translations. DO NOT MERGE
|
2012-11-27 14:24:20 -08:00 |
|
Baligh Uddin
|
234ac63bea
|
am 1e9f8d6f: Import translations. DO NOT MERGE
* commit '1e9f8d6f5401105a3e78c28689f0be5a6b5f4072':
Import translations. DO NOT MERGE
|
2012-11-27 14:24:19 -08:00 |
|
Baligh Uddin
|
3236571f45
|
am 42db418f: Import translations. DO NOT MERGE
* commit '42db418f963dfd200a75b518971c719215af352a':
Import translations. DO NOT MERGE
|
2012-11-27 14:23:27 -08:00 |
|
Baligh Uddin
|
45076f8eb1
|
am 20fbdbf1: Import translations. DO NOT MERGE
* commit '20fbdbf1ec15ee7ec27ad288802a6474f54db8c2':
Import translations. DO NOT MERGE
|
2012-11-27 14:22:43 -08:00 |
|
Baligh Uddin
|
1e9f8d6f54
|
Import translations. DO NOT MERGE
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
|
2012-11-27 14:22:35 -08:00 |
|
Baligh Uddin
|
42db418f96
|
Import translations. DO NOT MERGE
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
|
2012-11-27 14:21:30 -08:00 |
|
Baligh Uddin
|
20fbdbf1ec
|
Import translations. DO NOT MERGE
Change-Id: Icfe4b7b706f7ca8889a519688c222e35ecc5fb4e
Auto-generated-cl: translation import
|
2012-11-27 14:20:22 -08:00 |
|
The Android Open Source Project
|
db922ac691
|
am 86b76b21: (-s ours) am 19f09fb1: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '86b76b214ad46f02ecad2f147833b1026fa35b41':
|
2012-11-27 08:26:56 -08:00 |
|
The Android Open Source Project
|
86b76b214a
|
am 19f09fb1: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '19f09fb127cd193023fe518f4fe3ae890c1b52d4':
|
2012-11-27 08:24:23 -08:00 |
|
The Android Open Source Project
|
19f09fb127
|
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f
|
2012-11-27 08:21:40 -08:00 |
|
The Android Open Source Project
|
7476f782df
|
am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '346f5a481b945251245429be649c005a0d9103ad':
|
2012-11-27 07:46:34 -08:00 |
|
The Android Open Source Project
|
346f5a481b
|
Reconcile with jb-mr1.1-release - do not merge
Change-Id: If815fb1e8d064c7abb53ef05b81bb1495cfb7b2c
|
2012-11-27 07:43:37 -08:00 |
|
John Spurlock
|
8a9edfb1e3
|
Update a few dream setting strings to ease translation.
Clarify that sleep = asleep and charging as we do in the ui.
Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
|
2012-11-27 10:20:08 -05:00 |
|
The Android Automerger
|
2f9011a1b1
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-11-26 12:23:08 -08:00 |
|
The Android Automerger
|
4fb0c131fc
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-11-26 11:29:21 -08:00 |
|
Baligh Uddin
|
522de14ab4
|
am 60331810: (-s ours) am b1fdf6fd: am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE
* commit '60331810199d15048027140f4d70328625dea13c':
Import translations. DO NOT MERGE
|
2012-11-26 09:42:56 -08:00 |
|
Baligh Uddin
|
6033181019
|
am b1fdf6fd: am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE
* commit 'b1fdf6fd74036a9f83adfaae93ee6b3e89481d35':
Import translations. DO NOT MERGE
|
2012-11-26 09:40:09 -08:00 |
|
Baligh Uddin
|
da468cf928
|
am de241adb: (-s ours) am 089773ba: am 16a4c2b2: Import translations. DO NOT MERGE
* commit 'de241adbd3436c646b70fc9bf66a06fc6f7ba87a':
Import translations. DO NOT MERGE
|
2012-11-26 09:39:19 -08:00 |
|
Baligh Uddin
|
b1fdf6fd74
|
am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE
* commit '75e09c30a1b1eededc615d6dca319aab8ce40d2e':
Import translations. DO NOT MERGE
|
2012-11-26 09:38:44 -08:00 |
|
Baligh Uddin
|
de241adbd3
|
am 089773ba: am 16a4c2b2: Import translations. DO NOT MERGE
* commit '089773bacbc41032f85c02259d5bdb5f89502cce':
Import translations. DO NOT MERGE
|
2012-11-26 09:37:38 -08:00 |
|
Baligh Uddin
|
75e09c30a1
|
am 40129973: (-s ours) Import translations. DO NOT MERGE
* commit '401299739295b2305707810bbae2e49eadac50ba':
Import translations. DO NOT MERGE
|
2012-11-26 09:35:59 -08:00 |
|
Baligh Uddin
|
089773bacb
|
am 16a4c2b2: Import translations. DO NOT MERGE
* commit '16a4c2b2d38e2da6b26fc72029f9de0a1e282295':
Import translations. DO NOT MERGE
|
2012-11-26 09:35:10 -08:00 |
|
Baligh Uddin
|
eb8d1cea30
|
am ee6199cc: (-s ours) am e1dade77: Import translations. DO NOT MERGE
* commit 'ee6199cc9311f06dffdd02d20dcfbcd60fd6ea80':
Import translations. DO NOT MERGE
|
2012-11-26 09:34:18 -08:00 |
|
Baligh Uddin
|
ee6199cc93
|
am e1dade77: Import translations. DO NOT MERGE
* commit 'e1dade77d86201cfc513b400b70f7dc5a7bc127b':
Import translations. DO NOT MERGE
|
2012-11-26 09:31:28 -08:00 |
|
Baligh Uddin
|
a3c9e0a222
|
Import translations. DO NOT MERGE
Change-Id: I57d0bea750ee9e50470dcc3818880d8605719043
Auto-generated-cl: translation import
|
2012-11-22 23:22:23 -08:00 |
|
Baligh Uddin
|
16a4c2b2d3
|
Import translations. DO NOT MERGE
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
|
2012-11-22 23:19:57 -08:00 |
|
Baligh Uddin
|
4012997392
|
Import translations. DO NOT MERGE
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
|
2012-11-22 23:18:51 -08:00 |
|
Baligh Uddin
|
e1dade77d8
|
Import translations. DO NOT MERGE
Change-Id: Iab1d6346ddbe0fdfa02ad21f86ff7aea66e0ea0e
Auto-generated-cl: translation import
|
2012-11-22 23:17:46 -08:00 |
|
Baligh Uddin
|
4fc630d02c
|
am 0d7cc3b5: (-s ours) am 6dca6273: am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE
* commit '0d7cc3b5ea7d3b94a58dfda94196007ac1806b37':
Import translations. DO NOT MERGE
|
2012-11-22 11:22:19 -08:00 |
|
Baligh Uddin
|
0d7cc3b5ea
|
am 6dca6273: am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE
* commit '6dca62736d1bf83b2236094dbea76d0e79cd91fa':
Import translations. DO NOT MERGE
|
2012-11-22 11:21:21 -08:00 |
|
Baligh Uddin
|
6dca62736d
|
am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE
* commit '61b6c47e6c93ab20e8362517c48bd515c5647bdf':
Import translations. DO NOT MERGE
|
2012-11-22 11:19:32 -08:00 |
|
Baligh Uddin
|
61b6c47e6c
|
am e71a8772: Import translations. DO NOT MERGE
* commit 'e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d':
Import translations. DO NOT MERGE
|
2012-11-22 11:17:40 -08:00 |
|
Baligh Uddin
|
e71a8772bb
|
Import translations. DO NOT MERGE
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
|
2012-11-21 00:04:32 -08:00 |
|
The Android Automerger
|
6c1d5b105b
|
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2012-11-19 16:13:33 -08:00 |
|
Baligh Uddin
|
38fbf32013
|
am aaa9d694: (-s ours) am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE
* commit 'aaa9d694019a1afaf98fb70285098bc981764d80':
Import translations. DO NOT MERGE
|
2012-11-16 18:06:13 -08:00 |
|
Baligh Uddin
|
aaa9d69401
|
am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE
* commit '1fd5703d5e67d42a3a8819aa0db675b987671791':
Import translations. DO NOT MERGE
|
2012-11-16 18:04:17 -08:00 |
|
Baligh Uddin
|
1fd5703d5e
|
am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE
* commit 'e9f89cfbf5309453e8efc2826815592660e9e1c2':
Import translations. DO NOT MERGE
|
2012-11-16 18:02:20 -08:00 |
|