OSDN Git Service
Eric Fischer [Mon, 2 Jul 2012 20:58:53 +0000 (13:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16
Auto-generated-cl: translation import
Ying Wang [Sat, 30 Jun 2012 01:02:44 +0000 (18:02 -0700)]
am
d15183a9: (-s ours) am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
d15183a971590ca0e32bc78c8ed2a3470009fbae':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:59:04 +0000 (17:59 -0700)]
am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:55:02 +0000 (17:55 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Sat, 30 Jun 2012 00:54:50 +0000 (17:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dianne Hackborn [Fri, 29 Jun 2012 22:47:09 +0000 (15:47 -0700)]
am
d601be8f: am
313ab172: Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '
d601be8f945833ea95e6aaae769efb8ed26d964a':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:43:34 +0000 (15:43 -0700)]
am
313ab172: Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '
313ab1727014d535790bc89afdcf725ff936e5b4':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:01:23 +0000 (15:01 -0700)]
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
The installed app details was not correctly distinguishing between cache and
normal data on external storage. The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.
Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
Ying Wang [Fri, 29 Jun 2012 20:22:37 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I16afd7e6e7465bbd23cb0d2076bc13a9edffcd59
Auto-generated-cl: translation import
Ying Wang [Fri, 29 Jun 2012 20:19:19 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:19:33 +0000 (08:19 -0700)]
The Android Open Source Project [Fri, 29 Jun 2012 15:14:15 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
The Android Automerger [Fri, 29 Jun 2012 00:11:24 +0000 (17:11 -0700)]
merge in jb-release history after reset to jb-dev
Brian Muramatsu [Thu, 28 Jun 2012 23:59:01 +0000 (16:59 -0700)]
am
1f1b9abd: am
beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit '
1f1b9abd0059bf7873e9a54288dc61d43ec39284':
Fix Settings NPE
Brian Muramatsu [Thu, 28 Jun 2012 23:56:29 +0000 (16:56 -0700)]
am
beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit '
beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
Fix Settings NPE
Brian Muramatsu [Thu, 28 Jun 2012 23:53:47 +0000 (16:53 -0700)]
Merge "Fix Settings NPE" into jb-dev
Eric Fischer [Thu, 28 Jun 2012 21:30:26 +0000 (14:30 -0700)]
am
c70bec44: (-s ours) am
3cc385b8: Import translations. DO NOT MERGE
* commit '
c70bec4454e612b3013c075a5eb6e77346fc298b':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 28 Jun 2012 21:27:32 +0000 (14:27 -0700)]
am
3cc385b8: Import translations. DO NOT MERGE
* commit '
3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
Import translations. DO NOT MERGE
Brian Muramatsu [Thu, 28 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Fix Settings NPE
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.
Bug
6727947
Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
Eric Fischer [Thu, 28 Jun 2012 19:54:07 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib511e1cdf515c855ea235886b6c801a902136ba4
Auto-generated-cl: translation import
Eric Fischer [Thu, 28 Jun 2012 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
The Android Automerger [Thu, 28 Jun 2012 14:04:34 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 28 Jun 2012 00:24:33 +0000 (17:24 -0700)]
am
ebf032df: (-s ours) am
c812fe4c: Import translations. DO NOT MERGE
* commit '
ebf032dff98ad50163f2553f23a333f497041df3':
Import translations. DO NOT MERGE
Ying Wang [Thu, 28 Jun 2012 00:21:34 +0000 (17:21 -0700)]
am
c812fe4c: Import translations. DO NOT MERGE
* commit '
c812fe4c0e989fcea906a6dda7c88a55076cd50d':
Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 23:22:44 +0000 (16:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a59e4f258f041a175e9fd05a60da9c21daabf40
Ying Wang [Wed, 27 Jun 2012 23:19:29 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
The Android Automerger [Tue, 26 Jun 2012 18:11:58 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev
Jake Hamby [Tue, 26 Jun 2012 01:14:06 +0000 (18:14 -0700)]
resolved conflicts for merge of
8f12b128 to master
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
Jake Hamby [Mon, 25 Jun 2012 23:21:18 +0000 (16:21 -0700)]
am
f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
* commit '
f59dd9d67e269a81c684ecd641e514aba8d2330a':
Add menu item to Settings to go to Cell Broadcast settings.
Jake Hamby [Mon, 25 Jun 2012 23:19:23 +0000 (16:19 -0700)]
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Eric Fischer [Mon, 25 Jun 2012 20:36:50 +0000 (13:36 -0700)]
am
b12cc810: (-s ours) am
40b78280: Import translations. DO NOT MERGE
* commit '
b12cc8107dcbd84dd935768307b61ff5b3c4705e':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 25 Jun 2012 20:34:20 +0000 (13:34 -0700)]
am
40b78280: Import translations. DO NOT MERGE
* commit '
40b78280eb0c93d9ee3918813cfabf93a2919f35':
Import translations. DO NOT MERGE
Jake Hamby [Thu, 21 Jun 2012 17:59:22 +0000 (10:59 -0700)]
Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug:
6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
Eric Fischer [Mon, 25 Jun 2012 20:03:28 +0000 (13:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f51f7f30deeb640e4303810c1ad5ef277f5fdb4
Eric Fischer [Mon, 25 Jun 2012 20:00:04 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
The Android Open Source Project [Mon, 25 Jun 2012 15:00:20 +0000 (08:00 -0700)]
The Android Open Source Project [Mon, 25 Jun 2012 14:57:38 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16
Ying Wang [Sat, 23 Jun 2012 12:39:14 +0000 (05:39 -0700)]
am
7a1a575b: (-s ours) am
d7e8025f: Import translations. DO NOT MERGE
* commit '
7a1a575b74b829db940a3f26a1a1bb3040d50654':
Import translations. DO NOT MERGE
Ying Wang [Sat, 23 Jun 2012 12:36:47 +0000 (05:36 -0700)]
am
d7e8025f: Import translations. DO NOT MERGE
* commit '
d7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 23 Jun 2012 03:38:33 +0000 (20:38 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 22 Jun 2012 22:11:10 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1d5a9d10d1aef1e6631d216bb180c86734ebbe8
Ying Wang [Fri, 22 Jun 2012 22:07:41 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
The Android Open Source Project [Fri, 22 Jun 2012 15:20:20 +0000 (08:20 -0700)]
The Android Open Source Project [Fri, 22 Jun 2012 15:17:21 +0000 (08:17 -0700)]
Reconcile with jb-release
Change-Id: I7cd948231f3aa78f5d0a53889ed833af50738452
The Android Automerger [Fri, 22 Jun 2012 00:52:47 +0000 (17:52 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 21 Jun 2012 23:47:42 +0000 (16:47 -0700)]
am
3a96b102: (-s ours) am
3c46b110: Import translations. DO NOT MERGE
* commit '
3a96b102117b6118f031ddf60beb50f3050be743':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 22:52:25 +0000 (15:52 -0700)]
am
3c46b110: Import translations. DO NOT MERGE
* commit '
3c46b1103995434045b946a14d9909e866a8c8ab':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 22:43:46 +0000 (15:43 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 21 Jun 2012 22:07:31 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I324b2d81491c93cf6ff5b91bb3e5ebbc935fa65c
Eric Fischer [Thu, 21 Jun 2012 22:04:08 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
Eric Fischer [Thu, 21 Jun 2012 19:03:44 +0000 (12:03 -0700)]
am
4bc59c70: (-s ours) am
f776a738: Import translations. DO NOT MERGE
* commit '
4bc59c70060ecf10a6bfc79f348ae7255765a61c':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:52:14 +0000 (11:52 -0700)]
am
f776a738: Import translations. DO NOT MERGE
* commit '
f776a738fae4bcf0f81d59579a30efd400fbb295':
Import translations. DO NOT MERGE
The Android Automerger [Thu, 21 Jun 2012 14:04:22 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 21 Jun 2012 04:15:02 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I205f13efebfa6afae7a9c38dec8b16a3c4971f93
Eric Fischer [Thu, 21 Jun 2012 04:12:09 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
Amith Yamasani [Wed, 20 Jun 2012 22:51:14 +0000 (15:51 -0700)]
am
66b0ad57: am
9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev
* commit '
66b0ad5793ec329f756eb87b233f420697801539':
Fix incorrect updating of headers in Settings
Amith Yamasani [Wed, 20 Jun 2012 22:48:24 +0000 (15:48 -0700)]
am
9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev
* commit '
9938ac8a6e1885b2cd7f35fd6c63e2b04a84d36c':
Fix incorrect updating of headers in Settings
Amith Yamasani [Wed, 20 Jun 2012 22:45:05 +0000 (15:45 -0700)]
Merge "Fix incorrect updating of headers in Settings" into jb-dev
Ying Wang [Wed, 20 Jun 2012 21:51:49 +0000 (14:51 -0700)]
am
a104564d: (-s ours) am
679948df: Import translations. DO NOT MERGE
* commit '
a104564d9d3b378caebe1f7a7ea26a5a1ee6ccdc':
Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 21:49:14 +0000 (14:49 -0700)]
am
679948df: Import translations. DO NOT MERGE
* commit '
679948df3cf5c71bfe24ad4d6cd1bd78cb0fb28d':
Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 20:57:24 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3be9db85a08ed44c5559348bdc36468310077326
Ying Wang [Wed, 20 Jun 2012 20:54:32 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
Amith Yamasani [Wed, 20 Jun 2012 20:51:40 +0000 (13:51 -0700)]
Fix incorrect updating of headers in Settings
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.
This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.
Also make sure to invalidate headers on resume, so that the latest
account types are loaded.
Bug:
6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
The Android Open Source Project [Wed, 20 Jun 2012 15:31:45 +0000 (08:31 -0700)]
The Android Open Source Project [Wed, 20 Jun 2012 15:26:04 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f
The Android Automerger [Wed, 20 Jun 2012 14:04:02 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Christopher Tate [Tue, 19 Jun 2012 23:36:24 +0000 (16:36 -0700)]
am
1b4a9b41: am
5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '
1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
Use string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 23:34:01 +0000 (16:34 -0700)]
am
5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '
5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 23:31:11 +0000 (16:31 -0700)]
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 23:28:33 +0000 (16:28 -0700)]
am
e5d2b8b8: (-s ours) am
f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
e5d2b8b8ab0d9968c976f584917481f46995f65c':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:26:22 +0000 (16:26 -0700)]
am
f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
f4a4119eeaed1a99c082f253174b8acbca07c4c2':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:23:45 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 19 Jun 2012 23:23:23 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Christopher Tate [Tue, 19 Jun 2012 22:44:15 +0000 (15:44 -0700)]
Use string resources instead of literals for backup password confirmations
Localizability is good. Bug
6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
Eric Fischer [Tue, 19 Jun 2012 23:04:37 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: If94d32af0adb4eb24b5ff10f3555fd2b7cd0fdd2
Amith Yamasani [Tue, 19 Jun 2012 23:03:33 +0000 (16:03 -0700)]
am
f62df931: am
8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
* commit '
f62df931faefaece80059af39742f123e8d7f4e9':
Show full summary for network location sercice even for wifi-only devices
Amith Yamasani [Tue, 19 Jun 2012 23:01:50 +0000 (16:01 -0700)]
am
8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
* commit '
8e1981ccd314bf3e41601314e78cc9626a4299af':
Show full summary for network location sercice even for wifi-only devices
Eric Fischer [Tue, 19 Jun 2012 23:01:49 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
Amith Yamasani [Tue, 19 Jun 2012 22:59:48 +0000 (15:59 -0700)]
Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
Amith Yamasani [Tue, 19 Jun 2012 17:53:49 +0000 (10:53 -0700)]
Show full summary for network location sercice even for wifi-only devices
Bug:
6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
The Android Open Source Project [Tue, 19 Jun 2012 14:20:39 +0000 (07:20 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 14:16:03 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c
The Android Automerger [Tue, 19 Jun 2012 14:05:23 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:16:13 +0000 (06:16 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 13:13:55 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f
Ying Wang [Mon, 18 Jun 2012 21:55:09 +0000 (14:55 -0700)]
am
922eed65: (-s ours) am
fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
922eed658a954c35cb3bef6f8986f7ac4f9451c5':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:53:11 +0000 (14:53 -0700)]
am
fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:51:26 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 21:51:13 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Mon, 18 Jun 2012 21:44:02 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
Ying Wang [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
Jim Miller [Mon, 18 Jun 2012 20:23:25 +0000 (13:23 -0700)]
am
4a3435f8: am
284c9872: Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '
4a3435f86ee0dda6b824810ce439509cb61a8721':
Fix
6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Mon, 18 Jun 2012 20:22:05 +0000 (13:22 -0700)]
am
284c9872: Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '
284c9872cea3a5d97e1b1dd0016ac376da695175':
Fix
6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Mon, 18 Jun 2012 20:19:42 +0000 (13:19 -0700)]
Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 17:52:33 +0000 (10:52 -0700)]
am
2027328c: am
4d8dac07: Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
* commit '
2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
Implement issue #
6633077: Improve permissions display for...
Dianne Hackborn [Mon, 18 Jun 2012 17:52:33 +0000 (10:52 -0700)]
am
fe5a72da: am
ed99a81e: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
fe5a72dae2e7abc985b90641945e754492a20b67':
Fix issue #
6664140: Time to lock should work even Stay awake...
Ying Wang [Mon, 18 Jun 2012 17:52:32 +0000 (10:52 -0700)]
am
7622ce29: (-s ours) am
9d6d89ef: Import translations. DO NOT MERGE
* commit '
7622ce295543b9275fd18da1e2b66f8dff448d33':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 18 Jun 2012 17:33:07 +0000 (10:33 -0700)]
am
4d8dac07: Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
* commit '
4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
Implement issue #
6633077: Improve permissions display for...
Dianne Hackborn [Mon, 18 Jun 2012 17:33:00 +0000 (10:33 -0700)]
am
ed99a81e: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
ed99a81e1595c25d7070866ee0c2aa1d94103955':
Fix issue #
6664140: Time to lock should work even Stay awake...
Ying Wang [Mon, 18 Jun 2012 17:32:07 +0000 (10:32 -0700)]
am
9d6d89ef: Import translations. DO NOT MERGE
* commit '
9d6d89ef82f07ef54238699619d4875c4f2ae833':
Import translations. DO NOT MERGE
OSDN Git Service
