OSDN Git Service
Amith Yamasani [Thu, 1 Nov 2012 15:19:32 +0000 (08:19 -0700)]
Merge "Changed the way that date format selector is shown."
Fábio Silva [Mon, 15 Oct 2012 15:21:19 +0000 (12:21 -0300)]
Changed the way that date format selector is shown.
Changed the way that date format selector is shown excluding ambiguity when day and month have same value.
- i.e. 01/01/2012 (mm-DD-YYYY) and 01/01/2012 (DD-mm-YYYY)
Now it displays 31/12/2012 for DD-mm-YYYY and 12/31/2012 for mm-DD-YYYY.
Change-Id: I27434c9d5713491950d4f345dccf65d647d399cf
Elliott Hughes [Tue, 11 Sep 2012 02:02:47 +0000 (19:02 -0700)]
am
76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '
76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
Fix /proc/version parsing in Settings.
Elliott Hughes [Tue, 11 Sep 2012 01:02:38 +0000 (18:02 -0700)]
Merge "Fix /proc/version parsing in Settings."
Elliott Hughes [Thu, 6 Sep 2012 21:12:31 +0000 (14:12 -0700)]
Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
Elliott Hughes [Thu, 6 Sep 2012 23:38:37 +0000 (16:38 -0700)]
am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
cfbc61de3f94a620153ca83a790e4d1b03a9078e':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)]
resolved conflicts for merge of
33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
Elliott Hughes [Thu, 6 Sep 2012 22:50:10 +0000 (15:50 -0700)]
Merge "Stop using getDSTSavings."
Elliott Hughes [Thu, 6 Sep 2012 22:30:51 +0000 (15:30 -0700)]
Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.
Bug:
6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
Elliott Hughes [Thu, 6 Sep 2012 22:29:46 +0000 (15:29 -0700)]
Merge "Stop hard-coding sample 12- and 24-hour times."
Elliott Hughes [Thu, 6 Sep 2012 21:49:35 +0000 (14:49 -0700)]
Stop hard-coding sample 12- and 24-hour times.
Bug:
6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
Wink Saville [Tue, 28 Aug 2012 19:13:59 +0000 (12:13 -0700)]
am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:01:28 +0000 (12:01 -0700)]
Merge "Fix memory leak in ApnSettings-activity"
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:10:06 +0000 (11:10 -0700)]
am
38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '
38ce5194e89b83697466abe2994016507109ec54':
Enable to delete a stored persistent group from p2p settings.
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:46:59 +0000 (10:46 -0700)]
Merge "Enable to delete a stored persistent group from p2p settings."
Yoshihiko Ikenaga [Mon, 27 Aug 2012 13:10:05 +0000 (22:10 +0900)]
Enable to delete a stored persistent group from p2p settings.
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.
Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Amith Yamasani [Sat, 25 Aug 2012 19:56:23 +0000 (12:56 -0700)]
am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
52d996edeb7958d386bbf6655e9acfec3b10fdf2':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 18:55:41 +0000 (11:55 -0700)]
Merge "Settings: Fix crash seen when setting the radio band"
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)]
am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
1183f487c8ea8660415fcd30914844e8dc2de2bb':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:31:35 +0000 (09:31 -0700)]
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:33:50 +0000 (14:33 -0700)]
am
578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '
578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
Settings: disable Lock SIM card till response is received
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Merge "Settings: disable Lock SIM card till response is received"
Jeevaka Badrappan [Sun, 30 Oct 2011 13:54:41 +0000 (15:54 +0200)]
Settings: disable Lock SIM card till response is received
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.
Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 9954
Jake Hamby [Tue, 21 Aug 2012 01:06:25 +0000 (18:06 -0700)]
am
c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '
c46455ac7a2ad988700f975bb07558c8580bbe8e':
Enable "APN roaming protocol" for all platforms
Jake Hamby [Tue, 21 Aug 2012 00:27:35 +0000 (17:27 -0700)]
Merge "Enable "APN roaming protocol" for all platforms"
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:55:52 +0000 (08:55 -0700)]
am
0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '
0c869d694b59a55c8d53b57a12393b55530e798e':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:55:51 +0000 (08:55 -0700)]
am
d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit '
d61c23b3c20e990c34edfa5b257f558d479218cf':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:51:18 +0000 (08:51 -0700)]
Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:51:14 +0000 (08:51 -0700)]
Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
Jeevaka Badrappan [Fri, 1 Jun 2012 07:57:31 +0000 (10:57 +0300)]
Settings: Fix crash seen when setting the radio band
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.
Check the activity status before displaying the
set radio band result alert dialog.
Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 39317
The Android Open Source Project [Fri, 17 Aug 2012 01:57:02 +0000 (18:57 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
The Android Automerger [Fri, 17 Aug 2012 00:57:52 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Li Wenji [Sat, 11 Feb 2012 03:52:30 +0000 (11:52 +0800)]
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
When click Tethering, the checkbox will be checked and then unchecked,
and finally move to checked states. This causes confusing to end user,
we need to keep Tethering checkbox unchecked before tethering is really
up.
Change-Id: If2314b7dd1369e619dead45af38fd53c7e89c34e
Author: Li Wenji <wenji.li@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 18281
Wu, Hao [Fri, 20 Jul 2012 15:12:14 +0000 (23:12 +0800)]
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.
Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 27200
Baligh Uddin [Wed, 15 Aug 2012 14:56:52 +0000 (07:56 -0700)]
am
11665038: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
1166503886e834f74953bfdb6f0ee54d6c834249':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 15 Aug 2012 14:54:44 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Wed, 15 Aug 2012 04:51:07 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 20:09:11 +0000 (13:09 -0700)]
am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cb5624b80673e74f26d052f792dc8c9ce6e09a95':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:05:18 +0000 (13:05 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Tue, 14 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
c5acc132: Import translations. DO NOT MERGE
* commit '
c5acc132ca3de71c36cca1ebea2635396172ab4a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:45:33 +0000 (12:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:39:24 +0000 (08:39 -0700)]
am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:19:21 +0000 (08:19 -0700)]
Merge "Fix use of holo drawables in a few more places"
Björn Lundén [Mon, 13 Aug 2012 23:25:21 +0000 (01:25 +0200)]
Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
Jeff Sharkey [Mon, 13 Aug 2012 21:11:01 +0000 (14:11 -0700)]
am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 21:11:00 +0000 (14:11 -0700)]
am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
d7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
Don't direct to market if no markets installed
Baligh Uddin [Mon, 13 Aug 2012 20:24:26 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 13 Aug 2012 20:17:12 +0000 (13:17 -0700)]
Merge "Fix the issue the setting crashes after unmount SD card in landscape"
Jeff Sharkey [Mon, 13 Aug 2012 20:14:08 +0000 (13:14 -0700)]
Merge "Don't direct to market if no markets installed"
Jean-Baptiste Queru [Mon, 13 Aug 2012 19:02:26 +0000 (12:02 -0700)]
am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
Jean-Baptiste Queru [Mon, 13 Aug 2012 18:53:45 +0000 (11:53 -0700)]
Merge "Settings: Use ICS alert drawable"
Jack Wang [Thu, 27 Jan 2011 06:25:22 +0000 (14:25 +0800)]
Fix memory leak in ApnSettings-activity
When destroying the activity, the HandlerThread isnt stopped. This
results in that the thread remains, and if you enter/exit the
activity multiple times, you will end up with multiple threads and
a small memory leak
Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
Chuanxiao Dong [Tue, 24 Jul 2012 05:09:24 +0000 (13:09 +0800)]
Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.
Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26569
Li Gang [Fri, 20 Jan 2012 03:48:47 +0000 (11:48 +0800)]
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled,
disable the erasing and umount operation.
Judge SD card Mounting status and keep summary string.
Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7
Author: Li Gang <gang.g.li@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 47043
Tore Anderson [Wed, 8 Aug 2012 21:10:35 +0000 (23:10 +0200)]
Enable "APN roaming protocol" for all platforms
Allows users to change the protocol (the PDP context type) used when
roaming in the same way they already can for when they are in their home
network. This is required in order to make IPv6 and IPv4v6 data roaming
work correctly in 3GPP networks.
See also: http://code.google.com/p/android/issues/detail?id=32631
Change-Id: I052842122e5fe96a8779077f0ae9ff4bc83066c5
Signed-off-by: Tore Anderson <tore@fud.no>
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:11 +0000 (14:04 -0700)]
am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Add support for SE Android to the Settings app."
The Android Open Source Project [Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
The Android Automerger [Tue, 7 Aug 2012 20:01:34 +0000 (13:01 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Fri, 3 Aug 2012 21:38:01 +0000 (14:38 -0700)]
am
3eee86b8: Import translations. DO NOT MERGE
* commit '
3eee86b8d7bc175e1e83269afc5c2c5441681a50':
Import translations. DO NOT MERGE
Ying Wang [Fri, 3 Aug 2012 20:41:54 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
Michael Jurka [Fri, 3 Aug 2012 05:29:23 +0000 (22:29 -0700)]
am
ca511a81: Fix appwidget bind dialog
* commit '
ca511a8115962be7f598deb20aa47793db6d06f7':
Fix appwidget bind dialog
Michael Jurka [Fri, 3 Aug 2012 01:36:42 +0000 (18:36 -0700)]
Fix appwidget bind dialog
Bug:
6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
Ying Wang [Wed, 1 Aug 2012 22:28:32 +0000 (15:28 -0700)]
am
d7ae05db: Import translations. DO NOT MERGE
* commit '
d7ae05dbdc1af637e7e6655abb1a6b63e9d49968':
Import translations. DO NOT MERGE
Ying Wang [Wed, 1 Aug 2012 21:13:16 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 31 Jul 2012 21:48:53 +0000 (14:48 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6
The Android Automerger [Tue, 31 Jul 2012 21:07:44 +0000 (14:07 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Mon, 30 Jul 2012 22:06:58 +0000 (15:06 -0700)]
am
723bdf1e: Import translations. DO NOT MERGE
* commit '
723bdf1ec561d211b45f20546e6938e68feebf39':
Import translations. DO NOT MERGE
The Android Open Source Project [Mon, 30 Jul 2012 21:44:42 +0000 (14:44 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83
Ying Wang [Mon, 30 Jul 2012 20:25:03 +0000 (13:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
Ying Wang [Fri, 27 Jul 2012 22:46:02 +0000 (15:46 -0700)]
am
eaeb8b61: Import translations. DO NOT MERGE
* commit '
eaeb8b61d630e40dfe3851eb2a5f3300f3b30abe':
Import translations. DO NOT MERGE
Ying Wang [Fri, 27 Jul 2012 19:25:46 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
The Android Automerger [Fri, 27 Jul 2012 00:49:58 +0000 (17:49 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Amith Yamasani [Thu, 26 Jul 2012 23:07:19 +0000 (16:07 -0700)]
am
07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '
078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
Move Google-apps specific location settings to a Google package
Ying Wang [Thu, 26 Jul 2012 23:07:17 +0000 (16:07 -0700)]
am
4e53a0cb: Import translations. DO NOT MERGE
* commit '
4e53a0cbdc56fce1a7fcf94c83d4a0f70ffd6920':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 26 Jul 2012 22:15:22 +0000 (15:15 -0700)]
Merge "Move Google-apps specific location settings to a Google package" into jb-dev
Ying Wang [Thu, 26 Jul 2012 22:11:52 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I278308a46da25f82ee3da787b628cf67df4b6f0b
Auto-generated-cl: translation import
Amith Yamasani [Thu, 26 Jul 2012 01:28:51 +0000 (18:28 -0700)]
Move Google-apps specific location settings to a Google package
Bug:
6882764
This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.
Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
Ying Wang [Wed, 25 Jul 2012 22:06:15 +0000 (15:06 -0700)]
am
c31f6b23: Import translations. DO NOT MERGE
* commit '
c31f6b23e400dc00fa69dddf575c33a06def0363':
Import translations. DO NOT MERGE
Ying Wang [Wed, 25 Jul 2012 21:17:08 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56c497673b39fb29801bc6f4bb71ec205ddc4d10
Auto-generated-cl: translation import
Xingrun Chen [Tue, 12 Jun 2012 06:15:39 +0000 (14:15 +0800)]
Don't direct to market if no markets installed
The search intent cannot be resolved if there aren't any
market apps installed, so it will cause Settings crashed by
the ActivityNotFound exception.
So we need to check if the market intent requst can be resolved.
Then determine to notify user to direct the accessibility services
to market to get TalkBack or not.
Change-Id: I0f0d7b54eb5215e1a886315bb6816704384f6c59
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Ying Wang [Wed, 25 Jul 2012 05:01:08 +0000 (22:01 -0700)]
am
54199540: Import translations. DO NOT MERGE
* commit '
54199540b1d07af1a71e10ab096493245ed5fdbd':
Import translations. DO NOT MERGE
The Android Automerger [Wed, 25 Jul 2012 03:23:17 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 24 Jul 2012 19:39:36 +0000 (12:39 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Tue, 24 Jul 2012 19:38:57 +0000 (12:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24
Auto-generated-cl: translation import
Amith Yamasani [Tue, 24 Jul 2012 01:49:45 +0000 (18:49 -0700)]
am
4635ec6b: Strings for upcoming location settings changes.
* commit '
4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e':
Strings for upcoming location settings changes.
Amith Yamasani [Mon, 23 Jul 2012 23:40:02 +0000 (16:40 -0700)]
Strings for upcoming location settings changes.
Adding these first to parallelize translations.
Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
Ying Wang [Mon, 23 Jul 2012 21:03:33 +0000 (14:03 -0700)]
am
13be5469: Import translations. DO NOT MERGE
* commit '
13be54694f93172791bc342828594ede27919fc6':
Import translations. DO NOT MERGE
Ying Wang [Mon, 23 Jul 2012 20:05:38 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a
Auto-generated-cl: translation import
Stephen Smalley [Fri, 3 Feb 2012 16:14:48 +0000 (11:14 -0500)]
Add support for SE Android to the Settings app.
Display SELinux status (disabled, permissive, enforcing) under About phone.
Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
Ying Wang [Fri, 20 Jul 2012 21:04:56 +0000 (14:04 -0700)]
am
509cfa1d: Import translations. DO NOT MERGE
* commit '
509cfa1d5422e4b4f892bf4a8612f9548a7665bd':
Import translations. DO NOT MERGE
Ying Wang [Fri, 20 Jul 2012 19:53:45 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4
Auto-generated-cl: translation import
Ying Wang [Thu, 19 Jul 2012 21:51:30 +0000 (14:51 -0700)]
am
35e404c8: Import translations. DO NOT MERGE
* commit '
35e404c8f0236234cb75896f4d2b828bb60061aa':
Import translations. DO NOT MERGE
Ying Wang [Thu, 19 Jul 2012 21:21:34 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I029b2b28210dbac2b523152441195db55c352120
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
The Android Automerger [Thu, 19 Jul 2012 06:04:50 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 19 Jul 2012 04:44:53 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 19 Jul 2012 03:14:18 +0000 (20:14 -0700)]
am
2bc05a27: Import translations. DO NOT MERGE
* commit '
2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
Import translations. DO NOT MERGE
Ying Wang [Wed, 18 Jul 2012 23:18:09 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 20:41:39 +0000 (13:41 -0700)]
am
fa0f3fe1: Import translations. DO NOT MERGE
* commit '
fa0f3fe16225c57c91c9fe51981dc03f29938746':
Import translations. DO NOT MERGE
OSDN Git Service
