Romain Guy
e2d1799cd0
am 4d92c702: am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
...
* commit '4d92c702b5561ed072a73227c898e41ebac6b44e':
2012-10-29 13:39:38 -07:00
Zhihai Xu
a086ff471e
am 79cc26f2: am ac8cfd0b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit '79cc26f24c57c699ca890f5bbf3362c740db4f4f':
2012-10-29 13:39:37 -07:00
Daniel Sandler
33d4c1a313
am 653e5f9b: am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
...
* commit '653e5f9bc83148ba5452edb29fc576bac93fb89b':
2012-10-29 13:39:35 -07:00
Fabrice Di Meglio
2fad38ec27
am c5f7937e: am 17edbf38: am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
...
* commit 'c5f7937e064ee7c125c2f91c5b3a934b7b15d4d3':
2012-10-29 13:39:33 -07:00
Baligh Uddin
d6f005501b
am c2e65ef3: am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c2e65ef38e3946625465477e88cb5a59d36e1618':
2012-10-29 13:39:32 -07:00
Brian Muramatsu
c3b4ff2a05
am e447debb: am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
...
* commit 'e447debbd8f071a01d32d782aac2e02140c32572':
2012-10-29 13:39:30 -07:00
Amith Yamasani
b14659eb1a
am c250ae9d: am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
...
* commit 'c250ae9d712d7ba4b771ea8414876b9007a8da24':
2012-10-29 13:39:30 -07:00
John Huang
5224bbdf5b
am 2a43340d: am ff11f09a: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
...
* commit '2a43340ddb42ee3913235fcb9ddfd7ea33b6c085':
2012-10-29 13:39:29 -07:00
Baligh Uddin
434b9c4ff7
am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English.
...
* commit '06545e87b5db25abcdb5790c082fca894db9d664':
2012-10-29 13:39:29 -07:00
Casey Burkhardt
d3a3bfd598
am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
...
* commit 'af8b915f9c49b50aa02e41d3849ed0668b833328':
2012-10-29 13:39:28 -07:00
Baligh Uddin
f6932aebd4
am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
...
* commit 'a7489954019f0d451e0f63b8c39a6e06a9f83002':
2012-10-29 13:39:28 -07:00
Zhihai Xu
3cb9919c05
am b1571ad6: am 57569b40: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit 'b1571ad6866184c0048f60ea05e235856a1464b1':
2012-10-29 13:39:27 -07:00
Russell Brenner
c0b22b0a35
am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
...
* commit '98f884b19575e65702286820be58959c12f59815':
2012-10-29 13:39:26 -07:00
Amith Yamasani
1d4ecd8a63
am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users
...
* commit '3ad17a084836a3a501229e09d29fe9d838bc440f':
2012-10-29 13:39:25 -07:00
Daniel Sandler
96fcd6bb3d
am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
2012-10-29 13:39:25 -07:00
Michael Jurka
44e83b4eec
am ed3e89ab: am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
...
* commit 'ed3e89abe50425f50bce2880bff86a6e38772f10':
2012-10-29 13:39:24 -07:00
Amith Yamasani
d379946bca
am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
...
* commit '7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
2012-10-29 13:39:24 -07:00
Baligh Uddin
5f5f37b21f
am 391dc9f7: am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '391dc9f798a0b0314c0355a6347d38b8e2e8972e':
2012-10-29 13:39:23 -07:00
Baligh Uddin
27c1348b43
am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5fb549bf5f21cb240b4af35779e291d5d48f0109':
2012-10-29 13:39:23 -07:00
Baligh Uddin
aee2ef0a84
am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '350ea07ca8e650bf167491deefdb421a183bbedd':
Import translations. DO NOT MERGE
2012-10-29 13:39:21 -07:00
Guang Zhu
bb15cfbd11
am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
...
* commit '09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
2012-10-29 13:36:43 -07:00
Russell Brenner
1a15dcb1a2
am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required
...
* commit '3fd05c8853d67b273096dbbb7df6666273829ed5':
2012-10-29 13:36:42 -07:00
John Spurlock
7c9b067bb1
am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.
...
* commit '5586afe0eb5b4d6fba04f76d2a589164c526614f':
2012-10-29 13:36:41 -07:00
Jeff Sharkey
717ad24a82
am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '9d0fbd728e93de2b6b08a68d5843f47d180e46e8':
2012-10-29 13:36:40 -07:00
Romain Guy
4d92c702b5
am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
...
* commit '7caa7515f8673d9516620d2a5147be9e2233f1bb':
2012-10-29 13:36:38 -07:00
Zhihai Xu
79cc26f24c
am ac8cfd0b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit 'ac8cfd0b9c4814e286e5147f90b80d295380a4a7':
2012-10-29 13:36:37 -07:00
Daniel Sandler
653e5f9bc8
am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
...
* commit '8b6036c3fb4ebaf63026c658fb6871e4f11ed070':
2012-10-29 13:36:36 -07:00
Fabrice Di Meglio
c5f7937e06
am 17edbf38: am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
...
* commit '17edbf38d7d4efe2ca6526d1538136f4cd116509':
2012-10-29 13:36:35 -07:00
Baligh Uddin
c2e65ef38e
am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '67a54eaa812f1904c8e6dc17cc0888d252b53d3f':
2012-10-29 13:36:33 -07:00
Brian Muramatsu
e447debbd8
am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
...
* commit '0bfd02b05e1753703459bb2fdb3f9857a8b17d0d':
2012-10-29 13:35:02 -07:00
John Huang
2a43340ddb
am ff11f09a: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
...
* commit 'ff11f09af0fbfd0c42644cb6e262c29920d6ee5d':
2012-10-29 13:34:57 -07:00
Casey Burkhardt
af8b915f9c
am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
...
* commit '7367bb2a3118d8eb4cabc52883ec396a6b019e25':
2012-10-29 13:34:55 -07:00
Zhihai Xu
b1571ad686
am 57569b40: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
...
* commit '57569b4080f4987548915b29daf021d3bb2cbb7b':
2012-10-29 13:34:54 -07:00
Amith Yamasani
3ad17a0848
am 89e93c97: am 7a1c4cdf: Fix check for multiple users
...
* commit '89e93c97d5cbb9bace0d98862604e8330f32f5fb':
2012-10-29 13:34:53 -07:00
Michael Jurka
ed3e89abe5
am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page
...
* commit 'eabe82d032ee8a3668046792cb6743fec4181d58':
2012-10-29 13:34:52 -07:00
Baligh Uddin
391dc9f798
am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3441d4ac6a2368d56c2d88a65a36da414bd53a24':
2012-10-29 13:34:50 -07:00
Baligh Uddin
33ed3e0591
Import translations. DO NOT MERGE
...
Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
2012-10-29 13:31:03 -07:00
Baligh Uddin
fc66cb8386
Import translations. DO NOT MERGE
...
Change-Id: Iab4a9535ce1e86eb842f82bcbb9a7e689a168064
Auto-generated-cl: translation import
2012-10-29 13:24:42 -07:00
Baligh Uddin
d285188d24
Import translations. DO NOT MERGE
...
Change-Id: I93035479d7bf14c84ce3d39da4fca2dfdaadd9d6
Auto-generated-cl: translation import
2012-10-29 13:15:52 -07:00
Vikram Aggarwal
8d028a87e9
Allow wireless charging during encrypt
...
Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
source
Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
2012-10-29 12:42:55 -07:00
The Android Automerger
ab7392b892
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-29 11:20:23 -07:00
Baligh Uddin
8abf422a75
am af70bb4c: (-s ours) am 3e418847: Import translations. DO NOT MERGE
...
* commit 'af70bb4c8296c290491b2cc48004fc28a91d2ae4':
Import translations. DO NOT MERGE
2012-10-29 07:47:05 -07:00
Baligh Uddin
af70bb4c82
am 3e418847: Import translations. DO NOT MERGE
...
* commit '3e41884765347d7671e414c884901bafe70f225d':
Import translations. DO NOT MERGE
2012-10-29 07:44:33 -07:00
Przemyslaw Szczepaniak
03b9f86722
Alert for using network-only-tts with no network.
...
If TTS requires network for selected language, we will
show dialog informing why we can't synthesize an example
if user have no internet connectivity.
Bug: 7398316
Change-Id: I01b033a9a8b8538b322ed3639b671f90f849ae29
2012-10-29 04:48:38 -07:00
Baligh Uddin
910fe0479a
am e42e7b85: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
2012-10-28 18:36:02 -07:00
Baligh Uddin
6e16e83326
Import translations. DO NOT MERGE
...
Change-Id: I949227b4d696debe2a5ab01cf76960f352c48e4a
Auto-generated-cl: translation import
2012-10-28 12:46:08 -07:00
Baligh Uddin
9ad78e880f
Import translations. DO NOT MERGE
...
Change-Id: I60f85bd27cdf76663190767052c90db3c521848f
Auto-generated-cl: translation import
2012-10-28 12:43:44 -07:00
Baligh Uddin
e42e7b8528
Import translations. DO NOT MERGE
...
Change-Id: Ida5a2fe0251fde7f8ad846aa94564a5be6c5fe0b
Auto-generated-cl: translation import
2012-10-28 12:42:08 -07:00
Baligh Uddin
3e41884765
Import translations. DO NOT MERGE
...
Change-Id: I55019ba1b073d0d11ac5faed3830207e2066b7e8
Auto-generated-cl: translation import
2012-10-28 12:40:31 -07:00
Eric Laurent
79b7fdd2c0
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
2012-10-27 14:43:39 -07:00
