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
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
Baligh Uddin
e9f89cfbf5
am 7ed1879f: Import translations. DO NOT MERGE
...
* commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233':
Import translations. DO NOT MERGE
2012-11-16 17:59:01 -08:00
Baligh Uddin
7ed1879f28
Import translations. DO NOT MERGE
...
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
2012-11-16 15:51:59 -08:00
Eric Laurent
35a2d0fd09
am 4f103c0c: am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
...
* commit '4f103c0c1aed90e771b9f1d02b07ebb8b7780636':
fix dock audio enable dialog
2012-11-16 14:12:17 -08:00
Eric Laurent
4f103c0c1a
am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
...
* commit 'ccc1d614899459e2bb34ff977760bbb1cb225e95':
fix dock audio enable dialog
2012-11-16 14:09:47 -08:00
Eric Laurent
ccc1d61489
am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
...
* commit '15c27bb40bc493e898442e8e4ac9b52dd89dae58':
fix dock audio enable dialog
2012-11-16 14:07:07 -08:00
Eric Laurent
15c27bb40b
Merge "fix dock audio enable dialog" into jb-mr1.1-dev
2012-11-16 14:05:00 -08:00
Amith Yamasani
775176cbb4
am 21b5aacf: am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
...
* commit '21b5aacf34e5249b59cdbf0cc349fa2d604a25a4':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
2012-11-16 11:37:30 -08:00
The Android Automerger
eb63a1f228
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-16 11:29:50 -08:00
Amith Yamasani
21b5aacf34
am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
...
* commit '0aa79c73948af7600f289928b18b3231d9679f81':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
2012-11-16 10:48:59 -08:00
Amith Yamasani
0aa79c7394
am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
...
* commit '609772652250a4408c4cfef2560d145fd365db2b':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
2012-11-16 10:45:44 -08:00
Amith Yamasani
6097726522
Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
2012-11-16 10:43:04 -08:00
Vikram Aggarwal
c7da73229e
am 8761a053: am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
...
* commit '8761a0536b618c3dd2711b26142469b6a6591423':
Remove back button entirely when disabled
2012-11-16 10:38:13 -08:00
Amith Yamasani
afbf58aab3
am f6c07cab: am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
...
* commit 'f6c07cab362219ef4457b9fc418c6e11e34b17e0':
Fix a race condition when switching between settings panels
2012-11-16 10:38:04 -08:00
Jeff Sharkey
62bafa5935
am 282aacb5: am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
...
* commit '282aacb5c372bf8beece536ce3b2510f87be59db':
Internationalize bytes and percentages.
2012-11-16 10:37:37 -08:00
Jeff Sharkey
1b4dbed53f
am 8f7d5cac: am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
...
* commit '8f7d5cac7a78a203bb77a3086bf7b380c0c451f0':
Align "Make passwords visible" setting.
2012-11-16 10:37:36 -08:00
Baligh Uddin
46b36703f8
am b8fc41ff: (-s ours) am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE
...
* commit 'b8fc41ffeeb97c52c52e352d92f67480439f12cd':
Import translations. DO NOT MERGE
2012-11-16 10:37:13 -08:00
Baligh Uddin
4cc77634d5
am 0d459d6e: (-s ours) am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE
...
* commit '0d459d6e745736c59ad98cecdc56f2161df69d1c':
Import translations. DO NOT MERGE
2012-11-16 10:37:10 -08:00
Baligh Uddin
2c9eff0147
am e11331c8: (-s ours) am 29483a53: Import translations. DO NOT MERGE
...
* commit 'e11331c8140656fe81605bbb86aadf5fc4cfc7b6':
Import translations. DO NOT MERGE
2012-11-16 10:37:08 -08:00
Amith Yamasani
5f05010438
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
...
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.
Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
2012-11-15 14:44:41 -08:00
Vikram Aggarwal
8761a0536b
am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
...
* commit '49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
Remove back button entirely when disabled
2012-11-15 12:58:33 -08:00
Vikram Aggarwal
49a872436c
am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
...
* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
Remove back button entirely when disabled
2012-11-15 12:55:36 -08:00
