OSDN Git Service
Jeff Sharkey [Thu, 21 Feb 2013 23:31:09 +0000 (15:31 -0800)]
Explicit GridLayout alignment to fix warnings.
Also show lockdown VPN dialog whenever relaunched.
Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
Jeff Sharkey [Thu, 21 Feb 2013 17:47:48 +0000 (09:47 -0800)]
Improve notification UI for lockdown VPN.
Bug:
7064111
Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
Jim Miller [Fri, 8 Feb 2013 02:14:45 +0000 (18:14 -0800)]
Add explicit userId to AppWidget binder calls
Keyguard currently relies on being in the system process to grab the
given user's widgets. When we split keyguard into a new process,
it will need to have access to user-specific info to instantiate a
specific user's widgets. In order to accomplish this, we add an
explicit userid to each binder call as well as new permission
check to allow keyguard access.
This also fixes a potential race condition of having an incorrect user id
due to an async call to change the user. Every binder call now has a specific
user id. The user id is either the calling process user's id or an explicit
one passed by applications like keyguard. It is created once when an
AppWidgetManager is instantiated and remains for the lifetime of the object.
Change-Id: Iec767fb399677b3cf2f9c0993e06b49951eb1f66
Jeff Sharkey [Wed, 20 Feb 2013 20:36:20 +0000 (20:36 +0000)]
Merge "Give Wi-Fi Display settings split actionbar."
Jeff Sharkey [Wed, 20 Feb 2013 20:35:16 +0000 (12:35 -0800)]
Give Wi-Fi Display settings split actionbar.
Bug:
8156190
Change-Id: I120398e33cfbbce001a528de04d62cc92fe2f9d9
Amith Yamasani [Wed, 20 Feb 2013 17:17:18 +0000 (09:17 -0800)]
am
a5f756c9: Merge "Prevent cursor from causing global reference leaks."
* commit '
a5f756c9e66ee81585ba81d13a8e13f809bdd875':
Prevent cursor from causing global reference leaks.
Amith Yamasani [Wed, 20 Feb 2013 16:57:49 +0000 (16:57 +0000)]
Merge "Prevent cursor from causing global reference leaks."
Daniel Sandler [Wed, 20 Feb 2013 14:51:03 +0000 (14:51 +0000)]
Merge "Update notification list when notifications are posted."
Baligh Uddin [Tue, 19 Feb 2013 21:40:48 +0000 (13:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I51826906358134f3ea734f0c35af1dfce10f4530
Auto-generated-cl: translation import
Amith Yamasani [Tue, 19 Feb 2013 18:49:09 +0000 (18:49 +0000)]
Merge "Actually use the cache for names and icons."
Amith Yamasani [Tue, 19 Feb 2013 18:40:33 +0000 (10:40 -0800)]
Actually use the cache for names and icons.
Fixes the flashes in name and icon in Battery usage screen when refreshing.
Bug:
8219466
Some earlier refactoring must have messed up the cache's scope. It will now
avoid reloading name and icon if already present in the cache.
Change-Id: I99c1f14dd53828dcb74cf12c02c47628e2e64d30
Irfan Sheriff [Sat, 16 Feb 2013 00:18:51 +0000 (16:18 -0800)]
am
ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* commit '
ff5b96fb19e3a56a8803547a0c9cd11cfd97746c':
Use updated enterprise API
Fix EAP field display for a new network
Allow only valid EAP configs
Update enterprise API usage
Irfan Sheriff [Fri, 15 Feb 2013 23:42:50 +0000 (23:42 +0000)]
Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
Use updated enterprise API
Fix EAP field display for a new network
Allow only valid EAP configs
Update enterprise API usage
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way
Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.
Allow only support configs for various EAP methods
Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
Baligh Uddin [Fri, 15 Feb 2013 22:48:57 +0000 (14:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4bb5b296199aa3d33d9e653e2f982e67178c3e7f
Auto-generated-cl: translation import
Amith Yamasani [Fri, 15 Feb 2013 18:17:17 +0000 (10:17 -0800)]
am
1ef6a106: Merge "Fix Settings app crash after enabled multi-user"
* commit '
1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
Fix Settings app crash after enabled multi-user
Amith Yamasani [Fri, 15 Feb 2013 17:15:41 +0000 (17:15 +0000)]
Merge "Fix Settings app crash after enabled multi-user"
Daniel Sandler [Thu, 14 Feb 2013 22:05:52 +0000 (17:05 -0500)]
Update notification list when notifications are posted.
Change-Id: I4b7f1ae117401747d1788a0b009f36388cc2f4eb
Kenny Root [Thu, 14 Feb 2013 21:25:19 +0000 (13:25 -0800)]
resolved conflicts for merge of
bbe409d3 to master
Change-Id: I5d64f8d628636f3621b765873aade25eca948576
Kenny Root [Thu, 14 Feb 2013 20:18:11 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"
Kenny Root [Thu, 14 Feb 2013 18:27:22 +0000 (10:27 -0800)]
KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
Dianne Hackborn [Wed, 13 Feb 2013 19:02:12 +0000 (11:02 -0800)]
App ops: new labels, fix crash, fix updating list.
- Add new labels for media ops.
- Fix crash due to missing boolean entry for access notifications op.
- Fix updating op category lists to remain stable (not jump
back to the top).
Change-Id: I505cfd91b1ff92587a627d33f3ac7a21145a9bbd
Irfan Sheriff [Tue, 12 Feb 2013 22:57:14 +0000 (22:57 +0000)]
Merge "Use updated enterprise API"
Baligh Uddin [Tue, 12 Feb 2013 21:30:38 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 12 Feb 2013 20:27:01 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iba047f24fc3edbd4c57a5e53c8c6ef6f8acb5c03
Auto-generated-cl: translation import
Daniel Sandler [Thu, 17 Jan 2013 18:14:02 +0000 (13:14 -0500)]
Show the user's list of notifications in Settings.
Requires new APIs in change I41338230 and change Icce8d6f9
from frameworks/base.
Change-Id: I21b645bdc265b477453f9b177f6776e2c58bd323
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
Baligh Uddin [Mon, 11 Feb 2013 17:12:24 +0000 (09:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia18ab88594e12fcb1151329b127db50b1102f780
Auto-generated-cl: translation import
Baligh Uddin [Fri, 8 Feb 2013 19:03:45 +0000 (11:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: If973bc69ae7c28f8353eb8cafb1cf2cc7d86a711
Auto-generated-cl: translation import
Baligh Uddin [Fri, 8 Feb 2013 01:19:50 +0000 (01:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Thu, 7 Feb 2013 23:45:29 +0000 (15:45 -0800)]
Clean up RTL in Wi-Fi details dialog.
Bug:
7677078
Change-Id: Ic7652bc7bd0bc24ccacbe1135e763190cc6f12cd
Michael Jurka [Thu, 7 Feb 2013 10:09:14 +0000 (10:09 +0000)]
Merge "Update theme of ActivityPicker"
Dianne Hackborn [Thu, 7 Feb 2013 08:09:02 +0000 (08:09 +0000)]
Merge "App ops: add "draw on top" op, improve switch ordering."
Dianne Hackborn [Thu, 7 Feb 2013 08:01:10 +0000 (00:01 -0800)]
App ops: add "draw on top" op, improve switch ordering.
Change-Id: Ibe490305650f986f3ccf1ea25012272287455f59
Baligh Uddin [Wed, 6 Feb 2013 22:17:49 +0000 (14:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I90ee946c8575cc443beee288f6ded5a96afc0e55
Auto-generated-cl: translation import
Irfan Sheriff [Wed, 6 Feb 2013 19:20:40 +0000 (11:20 -0800)]
am
5c879e48: am
414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '
5c879e48eddfe617125733f2be46854a0266a23b':
P2PSetting:Avoid p2p_find on group removal event
Irfan Sheriff [Wed, 6 Feb 2013 19:16:24 +0000 (11:16 -0800)]
am
414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
414d9e9c6928581d4f91b008c109a6a4630bfaae':
P2PSetting:Avoid p2p_find on group removal event
Irfan Sheriff [Wed, 6 Feb 2013 19:03:37 +0000 (19:03 +0000)]
Merge "Fix EAP field display for a new network"
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way
Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
Irfan Sheriff [Wed, 6 Feb 2013 18:13:59 +0000 (18:13 +0000)]
Merge "P2PSetting:Avoid p2p_find on group removal event"
sunil duttu [Wed, 6 Feb 2013 07:13:54 +0000 (12:43 +0530)]
P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.
Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
Irfan Sheriff [Wed, 6 Feb 2013 17:02:26 +0000 (09:02 -0800)]
am
6639dee4: am
203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '
6639dee497304c359141caf9b0452699a6d64aa9':
wifiSettings: Updating the networkinfo on supplicant event
Irfan Sheriff [Wed, 6 Feb 2013 16:58:31 +0000 (08:58 -0800)]
am
203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
203631b24cd3947bcba2ab24789e4cfec487eff7':
wifiSettings: Updating the networkinfo on supplicant event
Irfan Sheriff [Wed, 6 Feb 2013 16:42:45 +0000 (16:42 +0000)]
Merge "wifiSettings: Updating the networkinfo on supplicant event"
Michael Jurka [Wed, 6 Feb 2013 13:54:54 +0000 (14:54 +0100)]
Update theme of ActivityPicker
Bug:
7971340
sunil duttu [Wed, 6 Feb 2013 05:42:03 +0000 (11:12 +0530)]
wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.
Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
Dianne Hackborn [Wed, 6 Feb 2013 01:36:47 +0000 (01:36 +0000)]
Merge "App ops: add modify settings op."
Dianne Hackborn [Wed, 6 Feb 2013 01:31:10 +0000 (17:31 -0800)]
App ops: add modify settings op.
Change-Id: I7aab6c7f565a20fe24156956895a7db20c8d3aaa
Mathias Agopian [Wed, 6 Feb 2013 01:16:09 +0000 (01:16 +0000)]
Merge "fix an issue where sensors power usage wasn't reported properly"
Baligh Uddin [Tue, 5 Feb 2013 20:07:34 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Tue, 5 Feb 2013 02:27:40 +0000 (18:27 -0800)]
App ops: add UI for SMS ops.
Change-Id: I595df9a286ba5389f9e309516dc4a8ab34773277
Amith Yamasani [Tue, 5 Feb 2013 19:15:07 +0000 (19:15 +0000)]
Merge "Improve error message to figure out which fragment class is problematic."
Amith Yamasani [Tue, 5 Feb 2013 18:56:55 +0000 (10:56 -0800)]
Improve error message to figure out which fragment class is problematic.
Bug:
8057867
Change-Id: I6ad0bc8c8a6ed9bc8a1cca5debffe15c6de3a1b5
Mathias Agopian [Tue, 5 Feb 2013 03:24:46 +0000 (19:24 -0800)]
fix an issue where sensors power usage wasn't reported properly
the battery service records a sensor's *handle*, but the
PowerUsageSummary code used it as a sensor *type*.
Change-Id: I0d2cbdffc24238d5e02f0d6369fa44ed990176a4
Baligh Uddin [Mon, 4 Feb 2013 17:59:27 +0000 (09:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6091aef5f86bfdc58cfe83f15e1292e7d86339dd
Auto-generated-cl: translation import
Jaewan Kim [Mon, 4 Feb 2013 06:36:17 +0000 (15:36 +0900)]
Fix Settings app crash after enabled multi-user
Bug:
8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
Benoit Goby [Sat, 2 Feb 2013 02:38:48 +0000 (02:38 +0000)]
Merge "Settings: Add setting to clear adb public keys"
Dianne Hackborn [Sat, 2 Feb 2013 01:29:15 +0000 (17:29 -0800)]
App ops: improve presentation.
Change-Id: Ia8702f9421a2cf2e27e8e24bfdc596321ace515a
Dianne Hackborn [Thu, 31 Jan 2013 23:06:57 +0000 (15:06 -0800)]
App ops: Support neighboring cells, call phone, improve UI.
Change-Id: I0783c7ae941499cf9847bcf657141c3aea76f59d
Russell Brenner [Fri, 1 Feb 2013 21:20:29 +0000 (21:20 +0000)]
Merge "Use non-breaking hyphen for "Wi-Fi""
Russell Brenner [Fri, 1 Feb 2013 18:57:49 +0000 (10:57 -0800)]
Use non-breaking hyphen for "Wi-Fi"
Strings flagged with 'translatable="false"' have not been altered.
Bug:
6632800
Change-Id: I1676d3fed7d6faec6ab4ec58d851fa976df2c43a
Daniel Sandler [Wed, 30 Jan 2013 19:03:58 +0000 (14:03 -0500)]
Migrate package notification controls to AppOps.
We still show the [X] Show Notifications box in
InstalledAppDetails for now, however the information should
be mostly in sync with the AppOps screen. ("Mostly" because
there's no way to register for changes to AppOp modes at
present.)
Change-Id: Ia5cdda26c140aed8ee7329caaeedac04b8cbd8f1
Daniel Sandler [Fri, 1 Feb 2013 14:43:38 +0000 (14:43 +0000)]
Merge "Fix bugs with null AppOp permissions."
Per Allard [Tue, 9 Oct 2012 12:18:55 +0000 (14:18 +0200)]
Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.
Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
Daniel Sandler [Thu, 31 Jan 2013 20:22:51 +0000 (15:22 -0500)]
Fix bugs with null AppOp permissions.
Change-Id: I9f199d4f5843fbba374ced8206902098811b3786
Svetoslav [Thu, 31 Jan 2013 03:17:06 +0000 (03:17 +0000)]
Merge "Remove "enhance web scripts" from settings."
Baligh Uddin [Wed, 30 Jan 2013 18:43:41 +0000 (10:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia4458289713f2e9f6c47882d2f2e99d36f6e2aec
Auto-generated-cl: translation import
Dianne Hackborn [Tue, 29 Jan 2013 23:22:22 +0000 (15:22 -0800)]
Improve resetting of application state.
We now reset preferred apps to our defaults, instead of
just clearing everything out.
Change-Id: I70f713ce62b2ffb2d7f6a8e056978847734c27f7
Svetoslav [Tue, 29 Jan 2013 10:16:41 +0000 (02:16 -0800)]
Remove "enhance web scripts" from settings.
See change Ic125514c34f191aea0416a469e4b3481ab3200b9 for details.
bug:
8089372
Change-Id: I47eda16579c29051aa24b8d4c38035439aa00915
Russell Brenner [Mon, 28 Jan 2013 19:35:55 +0000 (19:35 +0000)]
Merge "Revert "Use non-breaking hyphen for "Wi-Fi"""
Russell Brenner [Mon, 28 Jan 2013 19:33:40 +0000 (19:33 +0000)]
Revert "Use non-breaking hyphen for "Wi-Fi""
This reverts commit
6a98b9bf58b0715713834d75028b3c21a6d92a43
Change-Id: Ia4168462988e37f3470c510453c31c73ed63ab7b
Baligh Uddin [Mon, 28 Jan 2013 19:32:19 +0000 (19:32 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Mon, 28 Jan 2013 19:32:01 +0000 (19:32 +0000)]
Revert "Import translations. DO NOT MERGE"
broken build.
This reverts commit
3e93c29207e96387b367b18f47663972b2000e6b
Change-Id: Ib1f8d64f12add5ffbf1a777d22525fc55e226bc3
Russell Brenner [Sat, 19 Jan 2013 00:36:06 +0000 (16:36 -0800)]
Use non-breaking hyphen for "Wi-Fi"
Bug:
6632800
Change-Id: I5838a16ffce10ae6df4b2b5fd504b43124b6de3e
Baligh Uddin [Mon, 28 Jan 2013 18:33:40 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Mon, 28 Jan 2013 16:46:49 +0000 (16:46 +0000)]
Merge "Follow UX design guideline for frequency band"
Baligh Uddin [Mon, 28 Jan 2013 16:44:57 +0000 (08:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib27a3e53b1691361731f0a1b02d9f529cdd5f71a
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 26 Jan 2013 01:11:42 +0000 (17:11 -0800)]
am
bbf8daf4: am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Android Git Automerger (1) and others
* commit '
bbf8daf4602b62d806c4946196b526edbe08e056':
Fix of Settings application sort crash
Irfan Sheriff [Sat, 26 Jan 2013 01:11:31 +0000 (17:11 -0800)]
am
61b0f8c8: am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Android Git Automerger (1) and others
* commit '
61b0f8c88ab6c8254230aa7953bf619934d7d756':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Fri, 25 Jan 2013 22:37:20 +0000 (14:37 -0800)]
Follow UX design guideline for frequency band
Bug:
8019331
Change-Id: Ib87f4200ed42730d06485e339dc67cbb870b0538
Dianne Hackborn [Fri, 25 Jan 2013 03:14:26 +0000 (19:14 -0800)]
App ops: add UI for viewing and controlling ops per-app.
Change-Id: Iadd68cbd429af4d431dcd09b9adacd09c5092ae6
Dianne Hackborn [Fri, 25 Jan 2013 01:09:13 +0000 (17:09 -0800)]
am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
505232be07e388c602529e14254df013637b16f2':
Fix of Settings application sort crash
Dianne Hackborn [Fri, 25 Jan 2013 01:02:58 +0000 (01:02 +0000)]
Merge "Fix of Settings application sort crash"
Irfan Sheriff [Thu, 24 Jan 2013 19:30:12 +0000 (11:30 -0800)]
am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
b1ea6805d98bf953448db350ae33e53c3c3b797d':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Thu, 24 Jan 2013 18:50:05 +0000 (18:50 +0000)]
Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Dianne Hackborn [Wed, 23 Jan 2013 22:45:27 +0000 (22:45 +0000)]
Merge "Handle new "disabled until used" mode."
Baligh Uddin [Wed, 23 Jan 2013 19:34:51 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia36273d69a924d49f94116887962252c942d0042
Auto-generated-cl: translation import
Venkataraman Nerellapalli [Wed, 22 Feb 2012 09:12:46 +0000 (14:42 +0530)]
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.
Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a
Benoit Goby [Sat, 22 Dec 2012 00:43:20 +0000 (16:43 -0800)]
Settings: Add setting to clear adb public keys
Change-Id: I1d5ab7a83a3b7b23f0cd51305d965f45793eb853
Dianne Hackborn [Wed, 23 Jan 2013 01:17:25 +0000 (17:17 -0800)]
Handle new "disabled until used" mode.
We want these apps to still show up as normal apps,
not look like they have been disabled completely (entirely
gone) or by the user (listed separately as disabled).
Change-Id: Ib58ead274a74c6df3ee87c8db5f7d0652e37b9bd
Baligh Uddin [Wed, 23 Jan 2013 00:58:48 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Wed, 23 Jan 2013 00:25:15 +0000 (16:25 -0800)]
am
a6c51f3d: am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:20:28 +0000 (16:20 -0800)]
am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
7b8b6618219a2a9e1402858b513cf19628033204':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:09:51 +0000 (00:09 +0000)]
Merge "Fix for battery temperature display"
Irfan Sheriff [Tue, 22 Jan 2013 23:23:57 +0000 (15:23 -0800)]
am
814db19c: am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
814db19c4631dba3c60ac807771be4bf04c20880':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 23:12:22 +0000 (15:12 -0800)]
am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
67995f973dd524ba20983b9246a17a10746c4590':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 22:58:19 +0000 (22:58 +0000)]
Merge "Fix for F/C in WifiConfigInfo"
OSDN Git Service
