OSDN Git Service
Jeff Sharkey [Sat, 1 Dec 2012 01:46:17 +0000 (17:46 -0800)]
am
1d3dbecd: am
b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
* commit '
1d3dbecd9c76e0475f77d5bb443cd06018513944':
Fix incorrectly inverted text color.
Jeff Sharkey [Sat, 1 Dec 2012 01:45:20 +0000 (17:45 -0800)]
am
b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
* commit '
b0f3f8dbea32c8566ae29af4b9e2fcb904588c4f':
Fix incorrectly inverted text color.
Jeff Sharkey [Sat, 1 Dec 2012 01:44:23 +0000 (17:44 -0800)]
Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
Amith Yamasani [Sat, 1 Dec 2012 00:46:06 +0000 (16:46 -0800)]
am
64e327e1: am
1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
* commit '
64e327e1ef441491e700270e24299912aea8d6fe':
Disable USB debugging checkbox and backup password for secondary users
Amith Yamasani [Sat, 1 Dec 2012 00:44:27 +0000 (16:44 -0800)]
am
1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
* commit '
1cadd481bc34b466809b944a0f8490767cf92787':
Disable USB debugging checkbox and backup password for secondary users
Amith Yamasani [Sat, 1 Dec 2012 00:42:05 +0000 (16:42 -0800)]
Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
Amith Yamasani [Fri, 30 Nov 2012 22:20:04 +0000 (14:20 -0800)]
Disable USB debugging checkbox and backup password for secondary users
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.
Bug:
7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
Jeff Sharkey [Fri, 30 Nov 2012 20:32:58 +0000 (12:32 -0800)]
Fix incorrectly inverted text color.
Bug:
7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
Daniel Sandler [Fri, 30 Nov 2012 19:02:23 +0000 (11:02 -0800)]
am
aea3fbde: am
77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
* commit '
aea3fbde280107738281f568cb1f4d860f50abfc':
Add android.settings.DREAM_SETTINGS for Daydream settings.
Daniel Sandler [Fri, 30 Nov 2012 19:00:17 +0000 (11:00 -0800)]
am
77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
* commit '
77ec6de156c52edbda95894a609cc43dcd29e454':
Add android.settings.DREAM_SETTINGS for Daydream settings.
Daniel Sandler [Fri, 30 Nov 2012 18:58:03 +0000 (10:58 -0800)]
Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
Evan Charlton [Fri, 30 Nov 2012 18:20:38 +0000 (10:20 -0800)]
am
b71b78a4: am
6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit '
b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
Use plurals for the developer steps countdown
Evan Charlton [Fri, 30 Nov 2012 18:18:27 +0000 (10:18 -0800)]
am
6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit '
6c269982f3b188b5d7f70fcb670ab191b39b2689':
Use plurals for the developer steps countdown
Evan Charlton [Fri, 30 Nov 2012 18:15:24 +0000 (10:15 -0800)]
Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:27:44 +0000 (21:27 -0800)]
am
918c847d: am
43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
918c847dacbc52af3c1f438318bc1bb3ce9ceed8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:25:46 +0000 (21:25 -0800)]
am
43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
436350817f550819a3bf514c9ea74e12a1fbb2e8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:25:14 +0000 (21:25 -0800)]
am
4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:23:45 +0000 (21:23 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:23:28 +0000 (21:23 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Jeff Sharkey [Fri, 30 Nov 2012 02:02:09 +0000 (18:02 -0800)]
am
90dbd693: am
39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
* commit '
90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
Use uniform font size for APNs and timezones. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:02:08 +0000 (18:02 -0800)]
am
a04497d7: am
5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit '
a04497d70cc4f422cfa36c5be2f35a6170d5725a':
Avoid split action bar when it only has one item. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:00:37 +0000 (18:00 -0800)]
am
39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
* commit '
39b7bd8cbcd4413e8ab4dae5caa2b34f38530c95':
Use uniform font size for APNs and timezones. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:00:36 +0000 (18:00 -0800)]
am
5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit '
5d376860e9c76c4026b824dfd4b4d295541f4fef':
Avoid split action bar when it only has one item. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 01:58:21 +0000 (17:58 -0800)]
Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 01:58:19 +0000 (17:58 -0800)]
Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
Jake Hamby [Fri, 30 Nov 2012 00:19:15 +0000 (16:19 -0800)]
am
48b6e21b: am
6e8644bc: Add string resource removed by previous commit.
* commit '
48b6e21b75a5da10e9840aa88f2789956483de87':
Add string resource removed by previous commit.
Jake Hamby [Fri, 30 Nov 2012 00:17:08 +0000 (16:17 -0800)]
am
6e8644bc: Add string resource removed by previous commit.
* commit '
6e8644bcca75700757977be9fab1ffc501325c3e':
Add string resource removed by previous commit.
The Android Open Source Project [Thu, 29 Nov 2012 23:41:44 +0000 (15:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I5f455c4d385b0d72a9539104b6390abb94042277
Jake Hamby [Thu, 29 Nov 2012 23:06:20 +0000 (15:06 -0800)]
Add string resource removed by previous commit.
The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.
Bug:
7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
Jeff Sharkey [Thu, 29 Nov 2012 01:41:16 +0000 (17:41 -0800)]
Use uniform font size for APNs and timezones. DO NOT MERGE.
Also get rid of some orange highlight!
Bug:
7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
Jeff Sharkey [Thu, 29 Nov 2012 01:09:19 +0000 (17:09 -0800)]
Avoid split action bar when it only has one item. DO NOT MERGE.
Bug:
7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
Jake Hamby [Thu, 29 Nov 2012 22:28:50 +0000 (14:28 -0800)]
am
c5190506: am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
c51905067793a3f18c94df79eb15472cbb58322f':
Fix Bluetooth enable dialog to match Android style guide.
Dianne Hackborn [Thu, 29 Nov 2012 22:26:34 +0000 (14:26 -0800)]
am
ac4bfa60: am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 22:26:25 +0000 (14:26 -0800)]
am
e38d6277: am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
e38d6277c8355cca7239deed6a6df75f852b164d':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Jake Hamby [Thu, 29 Nov 2012 22:15:39 +0000 (14:15 -0800)]
am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
0206284a661b3370a175bb8c28c005aa6b45d9d3':
Fix Bluetooth enable dialog to match Android style guide.
Jake Hamby [Thu, 29 Nov 2012 22:14:10 +0000 (14:14 -0800)]
Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
Baligh Uddin [Thu, 29 Nov 2012 19:05:49 +0000 (11:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Nov 2012 19:04:26 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I42cd557944ae8f5f2da42603328eee04f5e6b25c
Auto-generated-cl: translation import
The Android Automerger [Thu, 29 Nov 2012 15:09:57 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:20:21 +0000 (18:20 -0800)]
am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
af6048010773606acf3a88df6954e1f7f3597a9f':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 02:18:26 +0000 (18:18 -0800)]
am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
9067d57a88e7bc43b7d1d0217b4b740f972bde47':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Dianne Hackborn [Thu, 29 Nov 2012 02:18:00 +0000 (18:18 -0800)]
Merge "Be quiet!" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:05:00 +0000 (18:05 -0800)]
Be quiet!
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
Adam Cohen [Thu, 29 Nov 2012 01:47:18 +0000 (17:47 -0800)]
Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
Adam Cohen [Thu, 29 Nov 2012 00:37:44 +0000 (16:37 -0800)]
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
Jeff Sharkey [Wed, 28 Nov 2012 21:04:58 +0000 (13:04 -0800)]
am
59ee3889: Merge "Settings: fix storage measurement for device without emulated sdcard"
* commit '
59ee3889088eb40ab6d8b0f4f9f11f51a89c0f76':
Settings: fix storage measurement for device without emulated sdcard
Jeff Sharkey [Wed, 28 Nov 2012 18:23:30 +0000 (10:23 -0800)]
Merge "Settings: fix storage measurement for device without emulated sdcard"
The Android Open Source Project [Wed, 28 Nov 2012 17:47:52 +0000 (09:47 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I81ef334240c928353194c517a94bf5e052b54322
John Spurlock [Wed, 28 Nov 2012 14:33:53 +0000 (06:33 -0800)]
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.
John Spurlock [Wed, 28 Nov 2012 14:31:50 +0000 (06:31 -0800)]
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.
John Spurlock [Wed, 28 Nov 2012 14:30:28 +0000 (06:30 -0800)]
Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 03:41:30 +0000 (22:41 -0500)]
Add android.settings.DREAM_SETTINGS for Daydream settings.
Bug:
7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
The Android Automerger [Tue, 27 Nov 2012 23:34:56 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Tue, 27 Nov 2012 22:26:47 +0000 (14:26 -0800)]
am
abd5b596: am
3236571f: am
42db418f: Import translations. DO NOT MERGE
* commit '
abd5b596febe7c1920ce8f46e0e3355dd44a0b99':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:26:46 +0000 (14:26 -0800)]
am
234ac63b: am
1e9f8d6f: Import translations. DO NOT MERGE
* commit '
234ac63beae7ea8d6612ab31ad7afc907d9d1c7b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:24:20 +0000 (14:24 -0800)]
am
3236571f: am
42db418f: Import translations. DO NOT MERGE
* commit '
3236571f4551bf20c4651ed9bc46380cd3ff8d67':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:24:19 +0000 (14:24 -0800)]
am
1e9f8d6f: Import translations. DO NOT MERGE
* commit '
1e9f8d6f5401105a3e78c28689f0be5a6b5f4072':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:23:27 +0000 (14:23 -0800)]
am
42db418f: Import translations. DO NOT MERGE
* commit '
42db418f963dfd200a75b518971c719215af352a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:22:43 +0000 (14:22 -0800)]
am
20fbdbf1: Import translations. DO NOT MERGE
* commit '
20fbdbf1ec15ee7ec27ad288802a6474f54db8c2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:22:35 +0000 (14:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 27 Nov 2012 22:21:30 +0000 (14:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
Baligh Uddin [Tue, 27 Nov 2012 22:20:22 +0000 (14:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfe4b7b706f7ca8889a519688c222e35ecc5fb4e
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 27 Nov 2012 16:24:23 +0000 (08:24 -0800)]
am
19f09fb1: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
19f09fb127cd193023fe518f4fe3ae890c1b52d4':
The Android Open Source Project [Tue, 27 Nov 2012 16:21:40 +0000 (08:21 -0800)]
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f
The Android Open Source Project [Tue, 27 Nov 2012 15:43:37 +0000 (07:43 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: If815fb1e8d064c7abb53ef05b81bb1495cfb7b2c
John Spurlock [Tue, 27 Nov 2012 15:15:51 +0000 (10:15 -0500)]
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
The Android Automerger [Mon, 26 Nov 2012 20:23:08 +0000 (12:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 26 Nov 2012 19:29:21 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Mon, 26 Nov 2012 17:40:09 +0000 (09:40 -0800)]
am
b1fdf6fd: am
75e09c30: am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
b1fdf6fd74036a9f83adfaae93ee6b3e89481d35':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:38:44 +0000 (09:38 -0800)]
am
75e09c30: am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
75e09c30a1b1eededc615d6dca319aab8ce40d2e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:37:38 +0000 (09:37 -0800)]
am
089773ba: am
16a4c2b2: Import translations. DO NOT MERGE
* commit '
089773bacbc41032f85c02259d5bdb5f89502cce':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:35:59 +0000 (09:35 -0800)]
am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
401299739295b2305707810bbae2e49eadac50ba':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:35:10 +0000 (09:35 -0800)]
am
16a4c2b2: Import translations. DO NOT MERGE
* commit '
16a4c2b2d38e2da6b26fc72029f9de0a1e282295':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:31:28 +0000 (09:31 -0800)]
am
e1dade77: Import translations. DO NOT MERGE
* commit '
e1dade77d86201cfc513b400b70f7dc5a7bc127b':
Import translations. DO NOT MERGE
Pawit Pornkitprasan [Fri, 23 Nov 2012 09:42:11 +0000 (16:42 +0700)]
Settings: fix storage measurement for device without emulated sdcard
StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.
StorageVolumePreferenceCategory:
- Always create mMountTogglePreference to avoid null pointer
exception for code that relies on it existing
- Check if the keys exist before calculating totalValues to
avoid null pointer exception on storage where media is not
calculated
- For available/readonly, set title, not summary (summary is
supposed to be the amount available)
Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
Baligh Uddin [Fri, 23 Nov 2012 07:19:57 +0000 (23:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 23 Nov 2012 07:18:51 +0000 (23:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 23 Nov 2012 07:17:46 +0000 (23:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab1d6346ddbe0fdfa02ad21f86ff7aea66e0ea0e
Auto-generated-cl: translation import
Baligh Uddin [Thu, 22 Nov 2012 19:21:21 +0000 (11:21 -0800)]
am
6dca6273: am
61b6c47e: am
e71a8772: Import translations. DO NOT MERGE
* commit '
6dca62736d1bf83b2236094dbea76d0e79cd91fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Nov 2012 19:19:32 +0000 (11:19 -0800)]
am
61b6c47e: am
e71a8772: Import translations. DO NOT MERGE
* commit '
61b6c47e6c93ab20e8362517c48bd515c5647bdf':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Nov 2012 19:17:40 +0000 (11:17 -0800)]
am
e71a8772: Import translations. DO NOT MERGE
* commit '
e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 Nov 2012 08:04:32 +0000 (00:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
Jake Hamby [Tue, 12 Jun 2012 00:04:14 +0000 (17:04 -0700)]
Fix Bluetooth enable dialog to match Android style guide.
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.
Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.
Bug:
6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
The Android Automerger [Tue, 20 Nov 2012 00:13:33 +0000 (16:13 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Sat, 17 Nov 2012 02:04:17 +0000 (18:04 -0800)]
am
1fd5703d: am
e9f89cfb: am
7ed1879f: Import translations. DO NOT MERGE
* commit '
1fd5703d5e67d42a3a8819aa0db675b987671791':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 17 Nov 2012 02:02:20 +0000 (18:02 -0800)]
am
e9f89cfb: am
7ed1879f: Import translations. DO NOT MERGE
* commit '
e9f89cfbf5309453e8efc2826815592660e9e1c2':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 17 Nov 2012 01:59:01 +0000 (17:59 -0800)]
am
7ed1879f: Import translations. DO NOT MERGE
* commit '
7ed1879f283e4c92fe47ab345c5fdf405e95f233':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:51:59 +0000 (15:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
Eric Laurent [Fri, 16 Nov 2012 22:09:47 +0000 (14:09 -0800)]
am
ccc1d614: am
15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
* commit '
ccc1d614899459e2bb34ff977760bbb1cb225e95':
fix dock audio enable dialog
Eric Laurent [Fri, 16 Nov 2012 22:07:07 +0000 (14:07 -0800)]
am
15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
* commit '
15c27bb40bc493e898442e8e4ac9b52dd89dae58':
fix dock audio enable dialog
Eric Laurent [Fri, 16 Nov 2012 22:05:00 +0000 (14:05 -0800)]
Merge "fix dock audio enable dialog" into jb-mr1.1-dev
The Android Automerger [Fri, 16 Nov 2012 19:29:50 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Amith Yamasani [Fri, 16 Nov 2012 18:48:59 +0000 (10:48 -0800)]
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
Amith Yamasani [Fri, 16 Nov 2012 18:45:44 +0000 (10:45 -0800)]
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
Amith Yamasani [Fri, 16 Nov 2012 18:43:03 +0000 (10:43 -0800)]
Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
Amith Yamasani [Thu, 1 Nov 2012 22:36:29 +0000 (15:36 -0700)]
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
Vikram Aggarwal [Thu, 15 Nov 2012 20:58:33 +0000 (12:58 -0800)]
am
49a87243: am
f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
* commit '
49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
Remove back button entirely when disabled
Vikram Aggarwal [Thu, 15 Nov 2012 20:55:36 +0000 (12:55 -0800)]
am
f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
* commit '
f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
Remove back button entirely when disabled
Vikram Aggarwal [Thu, 15 Nov 2012 20:53:25 +0000 (12:53 -0800)]
Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
Amith Yamasani [Thu, 15 Nov 2012 20:25:25 +0000 (12:25 -0800)]
am
4c326c2d: am
940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
* commit '
4c326c2d2dac4b8f0394d96aae1012d4143ff427':
Fix a race condition when switching between settings panels
OSDN Git Service
