OSDN Git Service
Baligh Uddin [Fri, 16 Aug 2013 01:01:09 +0000 (18:01 -0700)]
am
44a224ca: (-s ours) am
239c79c8: (-s ours) am
a7238c18: (-s ours) am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
44a224cabf32a5ce117bbc2b409b49f59cfe1e0b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:57:48 +0000 (17:57 -0700)]
am
239c79c8: (-s ours) am
a7238c18: (-s ours) am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
239c79c8d7f4b7c29c66f199eb7a5813b546ecb2':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:54:13 +0000 (17:54 -0700)]
am
a7238c18: (-s ours) am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
a7238c18b0b5a4500bc0b7a93ddcf4068d45fcd1':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:49:20 +0000 (17:49 -0700)]
am
28132bfd: (-s ours) am
eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28132bfd3e5c99828fe0092c6f7ebe5156b23524':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:05 +0000 (17:48 -0700)]
am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:47:37 +0000 (17:47 -0700)]
am
eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
eff5cd87f1de04c06880774c8fd3e3b230c16503':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:45:11 +0000 (00:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 16 Aug 2013 00:44:53 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Zhihai Xu [Fri, 16 Aug 2013 00:28:39 +0000 (17:28 -0700)]
am
97fb8dbb: am
3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
* commit '
97fb8dbbe8473fb53e33d6bb844773f69be7d776':
LE: Add support for the HID-over-GATT profile (3/3)
Zhihai Xu [Fri, 16 Aug 2013 00:24:54 +0000 (17:24 -0700)]
am
3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
* commit '
3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
LE: Add support for the HID-over-GATT profile (3/3)
Zhihai Xu [Fri, 16 Aug 2013 00:22:33 +0000 (00:22 +0000)]
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
Lifu Tang [Fri, 16 Aug 2013 00:01:08 +0000 (17:01 -0700)]
am
5c12d789: am
c3e9ac93: Linked the recent location apps to battery page
* commit '
5c12d789f520b5b9542c6826c521490a16aa9ee0':
Linked the recent location apps to battery page
Lifu Tang [Thu, 15 Aug 2013 23:59:25 +0000 (16:59 -0700)]
am
c3e9ac93: Linked the recent location apps to battery page
* commit '
c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
Linked the recent location apps to battery page
Andre Eisenbach [Fri, 8 Mar 2013 02:05:12 +0000 (18:05 -0800)]
LE: Add support for the HID-over-GATT profile (3/3)
bug:
8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
Lifu Tang [Mon, 12 Aug 2013 23:34:45 +0000 (16:34 -0700)]
Linked the recent location apps to battery page
* Extracted BatteryStatsHelper from PowerUsageSummary
* Dropped the "pause" and "resume" method from the
RadioButtonPreference
* Opening battery usage page when the user clicks the recent location
apps item
Change-Id: I5a2d03271434765780154265976d8caa7f8060d8
Lifu Tang [Thu, 15 Aug 2013 19:19:05 +0000 (12:19 -0700)]
am
adb9f2b9: am
5db411db: Merge "Shows "App Info" for system apps" into klp-dev
* commit '
adb9f2b9929d4aa9086902f5976388ed61181674':
Shows "App Info" for system apps
Lifu Tang [Thu, 15 Aug 2013 19:17:03 +0000 (12:17 -0700)]
am
5db411db: Merge "Shows "App Info" for system apps" into klp-dev
* commit '
5db411db9881ea9ec48f2a607b711d8daa74d1ca':
Shows "App Info" for system apps
Lifu Tang [Thu, 15 Aug 2013 19:13:42 +0000 (19:13 +0000)]
Merge "Shows "App Info" for system apps" into klp-dev
Robert Greenwalt [Thu, 15 Aug 2013 14:21:07 +0000 (07:21 -0700)]
am
9e96c453: am
a1fa7cef: am
1faefa06: Merge "Fix one NPE in tethering setting"
* commit '
9e96c453fb84ec4832bde217617958121947128b':
Fix one NPE in tethering setting
Robert Greenwalt [Thu, 15 Aug 2013 14:19:36 +0000 (07:19 -0700)]
am
a1fa7cef: am
1faefa06: Merge "Fix one NPE in tethering setting"
* commit '
a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
Fix one NPE in tethering setting
Robert Greenwalt [Thu, 15 Aug 2013 14:17:11 +0000 (07:17 -0700)]
am
1faefa06: Merge "Fix one NPE in tethering setting"
* commit '
1faefa06a3a742123af8ea5be5bbfb730db16c7c':
Fix one NPE in tethering setting
Robert Greenwalt [Thu, 15 Aug 2013 14:13:09 +0000 (14:13 +0000)]
Merge "Fix one NPE in tethering setting"
Jianzheng Zhou [Thu, 15 Aug 2013 06:34:52 +0000 (14:34 +0800)]
Fix one NPE in tethering setting
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Lifu Tang [Thu, 15 Aug 2013 00:25:12 +0000 (17:25 -0700)]
Shows "App Info" for system apps
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app
Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
Baligh Uddin [Wed, 14 Aug 2013 21:50:28 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica475ca583a88772689f57745da3023d9955e70b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Aug 2013 21:46:29 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Aug 2013 21:44:15 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 14 Aug 2013 21:30:02 +0000 (14:30 -0700)]
am
c4cdd59e: (-s ours) Reconcile with klp-release - do not merge
* commit '
c4cdd59e025e574a78c47bb6db83b31e46e66b04':
Fix bug when sharing to bluetooth.
Fix for TTS settings crash.
Restriction pin changes.
Remove Restrictions UI
Add some missing fragments to the whitelist
Potential fix for Settings instability on x-large.
Fix accidental creation of restriction entry for required apps
Fix broken strings in Settings
Always allow formatting of physical storage.
Guard against missing terminal app.
The Android Open Source Project [Wed, 14 Aug 2013 21:25:51 +0000 (14:25 -0700)]
Reconcile with klp-release - do not merge
Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95
Martijn Coenen [Wed, 14 Aug 2013 16:02:30 +0000 (09:02 -0700)]
am
9995bcbc: am
fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
* commit '
9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
NFC: Allow to get result from tap-pay default dialog.
Martijn Coenen [Wed, 14 Aug 2013 16:00:01 +0000 (09:00 -0700)]
am
fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
* commit '
fcfd865d5c1f2e20952d64196922840a63e83411':
NFC: Allow to get result from tap-pay default dialog.
Martijn Coenen [Wed, 14 Aug 2013 15:58:06 +0000 (15:58 +0000)]
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
Martijn Coenen [Wed, 14 Aug 2013 15:57:11 +0000 (08:57 -0700)]
NFC: Allow to get result from tap-pay default dialog.
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
The Android Automerger [Wed, 14 Aug 2013 13:06:53 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev
Tom O'Neill [Wed, 14 Aug 2013 00:37:55 +0000 (17:37 -0700)]
am
0574c26c: am
cabe7e82: Merge "Settings app supports location settings injection" into klp-dev
* commit '
0574c26c36b1b760d80107fb4171cdcb642aabf1':
Settings app supports location settings injection
Tom O'Neill [Wed, 14 Aug 2013 00:34:20 +0000 (17:34 -0700)]
am
cabe7e82: Merge "Settings app supports location settings injection" into klp-dev
* commit '
cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
Tom O'Neill [Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)]
Merge "Settings app supports location settings injection" into klp-dev
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.
Bug:
10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.
Play an example is wrongly enabled before TTS engine is initialized.
Bug:
10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
Maggie Benthall [Tue, 13 Aug 2013 17:05:36 +0000 (10:05 -0700)]
am
fa6faf95: am
cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
* commit '
fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
Fix bug when sharing to bluetooth.
Maggie Benthall [Tue, 13 Aug 2013 17:04:09 +0000 (10:04 -0700)]
am
cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
* commit '
cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
Fix bug when sharing to bluetooth.
Maggie Benthall [Tue, 13 Aug 2013 17:00:24 +0000 (17:00 +0000)]
Merge "Fix bug when sharing to bluetooth." into klp-dev
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 13:44:49 +0000 (06:44 -0700)]
am
d92af47f: am
0e01f128: Fix for TTS settings crash.
* commit '
d92af47f9369f50edac2d5c36f78aee4997bbe8d':
Fix for TTS settings crash.
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 13:43:09 +0000 (06:43 -0700)]
am
0e01f128: Fix for TTS settings crash.
* commit '
0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
Fix for TTS settings crash.
The Android Automerger [Tue, 13 Aug 2013 13:04:16 +0000 (06:04 -0700)]
merge in klp-release history after reset to klp-dev
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.
Play an example is wrongly enabled before TTS engine is initialized.
Bug:
10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
Baligh Uddin [Tue, 13 Aug 2013 07:56:28 +0000 (00:56 -0700)]
am
3b3a8b09: (-s ours) am
0782e629: (-s ours) am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:53:52 +0000 (00:53 -0700)]
am
0782e629: (-s ours) am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
0782e6293bec6f51e5ecd23525f945823e5b4632':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:51:57 +0000 (00:51 -0700)]
am
965d7569: (-s ours) am
fff94ce8: (-s ours) am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
965d756920d556d95178d48127ee14abcda85916':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:48:30 +0000 (00:48 -0700)]
am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:47:30 +0000 (00:47 -0700)]
am
b142c946: (-s ours) am
a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit '
b142c9462f138de363ea1f6c42eaf5884ff2b645':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:47:21 +0000 (00:47 -0700)]
am
fff94ce8: (-s ours) am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
fff94ce8cc24861de614bedb193e926e62179e04':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:45:32 +0000 (00:45 -0700)]
am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:44:04 +0000 (00:44 -0700)]
am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:43:55 +0000 (00:43 -0700)]
am
a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit '
a45cd5a60ef71e70c4d4530370f46766d517541a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:15 +0000 (00:42 -0700)]
am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:11 +0000 (00:42 -0700)]
am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
Tom O'Neill [Mon, 12 Aug 2013 23:22:48 +0000 (16:22 -0700)]
Settings app supports location settings injection
- Partial fix for b/
10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.
Bug:
10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
Baligh Uddin [Mon, 12 Aug 2013 18:54:53 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:51:11 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:48:59 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:47:40 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
The Android Automerger [Mon, 12 Aug 2013 13:02:34 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Zhihai Xu [Sat, 10 Aug 2013 01:52:07 +0000 (18:52 -0700)]
am
eb9cecd9: am
6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
eb9cecd98b280c508b88d03ad788202ac0e35e53':
Bluetooth MAP profile - sms and mms support initial check-in
Zhihai Xu [Sat, 10 Aug 2013 01:49:59 +0000 (18:49 -0700)]
am
6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
6ee5b4508083fd0dd340396d66927c0fc8870a9b':
Bluetooth MAP profile - sms and mms support initial check-in
Zhihai Xu [Sat, 10 Aug 2013 01:46:22 +0000 (01:46 +0000)]
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 23:49:18 +0000 (16:49 -0700)]
am
3c7fdfd9: am
a582a051: Proc stats UI improvements.
* commit '
3c7fdfd9e957ddb68fccba524a12fab84b469744':
Proc stats UI improvements.
Dianne Hackborn [Fri, 9 Aug 2013 23:38:11 +0000 (16:38 -0700)]
am
a582a051: Proc stats UI improvements.
* commit '
a582a051951be9b1afd57e05fd6a405bccd9a46f':
Proc stats UI improvements.
Dianne Hackborn [Fri, 9 Aug 2013 23:17:27 +0000 (16:17 -0700)]
Proc stats UI improvements.
Now have a chart showing the memory state, and text showing the
current memory state. Trying to do better at picking the application
to blame for a process hosting multiple apps. Start of infrastructure
for more detailed reporting.
Change-Id: I93ca7ecf2fd0bc01e3be8d28b80212ac78fe7607
Martijn Coenen [Fri, 9 Aug 2013 22:54:17 +0000 (15:54 -0700)]
am
0aee1b15: am
53083ab2: Instantiate correct classes for tap&say settings.
* commit '
0aee1b150624f4b36e52e47fa97b8a18350d2df5':
Instantiate correct classes for tap&say settings.
Geoffrey Borggaard [Fri, 9 Aug 2013 22:54:16 +0000 (15:54 -0700)]
am
863b8839: am
fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '
863b8839c7685554b41f3143472a6f379fd29ad1':
Allow navigation to TrustedCredentials User Certs by intent.
Dianne Hackborn [Fri, 9 Aug 2013 22:54:15 +0000 (15:54 -0700)]
am
b690af54: am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
b690af54dc0c5e82d15226c5a85be713bcd25db2':
Improve process stats UI.
Alan Viverette [Fri, 9 Aug 2013 22:54:15 +0000 (15:54 -0700)]
am
85c37e78: am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
85c37e78b5bb21788ce3edb42363e550895cd9fc':
Update captioning settings to match final design
Matthew Xie [Fri, 19 Jul 2013 00:16:27 +0000 (17:16 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: I3f50e66420e53bf21a1ecba06aed6b8261ff3064
Martijn Coenen [Fri, 9 Aug 2013 22:22:19 +0000 (15:22 -0700)]
am
53083ab2: Instantiate correct classes for tap&say settings.
* commit '
53083ab2bbcadf7f1bcbefbaa2e4ee5c85349d84':
Instantiate correct classes for tap&say settings.
Geoffrey Borggaard [Fri, 9 Aug 2013 22:22:15 +0000 (15:22 -0700)]
am
fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '
fc6bc20161edea9e93a7abcd82af5c26870c58bb':
Allow navigation to TrustedCredentials User Certs by intent.
Dianne Hackborn [Fri, 9 Aug 2013 22:22:08 +0000 (15:22 -0700)]
am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
f3796d0bf8bfa3a0e4359dcdf4017961bd312dea':
Improve process stats UI.
Alan Viverette [Fri, 9 Aug 2013 22:22:05 +0000 (15:22 -0700)]
am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
c0f79432cff613e993a86bece93ab1ef674d9054':
Update captioning settings to match final design
Martijn Coenen [Fri, 9 Aug 2013 20:37:38 +0000 (13:37 -0700)]
Instantiate correct classes for tap&say settings.
Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098
Geoffrey Borggaard [Fri, 9 Aug 2013 15:44:42 +0000 (11:44 -0400)]
Allow navigation to TrustedCredentials User Certs by intent.
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
Dianne Hackborn [Fri, 9 Aug 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Improve process stats UI." into klp-dev
Alan Viverette [Fri, 9 Aug 2013 19:11:25 +0000 (19:11 +0000)]
Merge "Update captioning settings to match final design" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 19:08:54 +0000 (12:08 -0700)]
Improve process stats UI.
Now roll up multiple process stats to have at least a
day of data, change the visualization to have the bars show
"weight" (duration*pss) and the text the percent of total
time running, add label to show how much time the stats
are over.
Change-Id: I73763cb6a66d03d856ea4bf517eac0fe39c79c52
Amith Yamasani [Fri, 9 Aug 2013 13:06:52 +0000 (06:06 -0700)]
am
d04e36e6: am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
d04e36e6f2259747dac4c4a1fa0393f72dc078af':
Fix inconsistent text in Settings>Security>Screen lock
Amith Yamasani [Fri, 9 Aug 2013 13:05:56 +0000 (06:05 -0700)]
am
1eb6105f: am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
1eb6105f25dcecde565f9d56e5c87feed7bd520d':
Potential fix for Bug:
10241642
Dianne Hackborn [Fri, 9 Aug 2013 09:37:10 +0000 (02:37 -0700)]
am
cd20ebcc: am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
cd20ebcc8c0261765fa8e6de57df3f72062c710e':
Initial rough stab at a proc stats UI.
Amith Yamasani [Fri, 9 Aug 2013 00:31:23 +0000 (17:31 -0700)]
am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
2f219c51ad2151c9d31912d836276679e0dd747d':
Fix inconsistent text in Settings>Security>Screen lock
Amith Yamasani [Fri, 9 Aug 2013 00:28:48 +0000 (00:28 +0000)]
Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
Amith Yamasani [Fri, 9 Aug 2013 00:27:23 +0000 (17:27 -0700)]
Fix inconsistent text in Settings>Security>Screen lock
Bug:
10157179
Change-Id: Ib508b161d87248679fb9b8f3dae1584f73f18dcb
Baligh Uddin [Thu, 8 Aug 2013 23:58:46 +0000 (16:58 -0700)]
am
921a3144: (-s ours) am
dcd15ee0: (-s ours) am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
921a3144a06496acfb06b512e443473141056304':
The Android Open Source Project [Thu, 8 Aug 2013 23:58:45 +0000 (16:58 -0700)]
am
8c1845a6: (-s ours) am
76cbd841: am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8c1845a6d669b03c2827965042f2e47e49f2d6b1':
Baligh Uddin [Thu, 8 Aug 2013 23:58:44 +0000 (16:58 -0700)]
am
c7891c6c: (-s ours) am
ff2aed99: (-s ours) am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
Amith Yamasani [Thu, 8 Aug 2013 23:58:43 +0000 (16:58 -0700)]
am
05e2459f: am
82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
* commit '
05e2459fb85848b19362554a7ffeb2e9b50da720':
Developer option to force RTL layout direction
David Christie [Thu, 8 Aug 2013 23:58:42 +0000 (16:58 -0700)]
am
aba6eb64: am
b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
* commit '
aba6eb64633e7957afe036a5d7c506b9c059ec3e':
Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
Svetoslav [Thu, 8 Aug 2013 23:58:41 +0000 (16:58 -0700)]
am
0427cb67: am
3f257c4d: Fix a crash in accessibiility settings.
* commit '
0427cb67d1545d38859e6522905b4a78d82bacc7':
Fix a crash in accessibiility settings.
Lifu Tang [Thu, 8 Aug 2013 23:58:40 +0000 (16:58 -0700)]
am
098061c2: am
88afb32f: Displays a list of most recent location apps
* commit '
098061c2022164e169ec40e6114b48dd5bfcaff2':
Displays a list of most recent location apps
Lifu Tang [Thu, 8 Aug 2013 23:58:39 +0000 (16:58 -0700)]
am
7b449db2: am
b14698ee: Merge "Finished the location settings"
* commit '
7b449db21ecae05f95355544936bd840a89601c7':
Jason Monk [Thu, 8 Aug 2013 23:58:39 +0000 (16:58 -0700)]
Baligh Uddin [Thu, 8 Aug 2013 23:58:38 +0000 (16:58 -0700)]
am
dfa45967: (-s ours) am
7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
dfa4596778b39d07aa7f27145baedee31d17cd48':
OSDN Git Service
