The Android Automerger
278640ca83
merge in klp-release history after reset to klp-dev
2013-08-14 06:06:53 -07:00
Tom O'Neill
4a41f33c5a
am 0574c26c
: am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
Settings app supports location settings injection
2013-08-13 17:37:55 -07:00
Tom O'Neill
0574c26c36
am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Maggie Benthall
d0e9f6ada3
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-13 13:29:45 -07:00
Przemyslaw Szczepaniak
72f078a310
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:29:35 -07:00
Maggie Benthall
b8bdd1a0c9
am fa6faf95
: am cd3eb97c
: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
Fix bug when sharing to bluetooth.
2013-08-13 10:05:36 -07:00
Maggie Benthall
fa6faf95bc
am cd3eb97c
: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
Fix bug when sharing to bluetooth.
2013-08-13 10:04:09 -07:00
Maggie Benthall
cd3eb97ce5
Merge "Fix bug when sharing to bluetooth." into klp-dev
2013-08-13 17:00:25 +00:00
Przemyslaw Szczepaniak
2dc0e493ab
am d92af47f
: am 0e01f128
: Fix for TTS settings crash.
...
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
Fix for TTS settings crash.
2013-08-13 06:44:49 -07:00
Przemyslaw Szczepaniak
d92af47f93
am 0e01f128
: Fix for TTS settings crash.
...
* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
Fix for TTS settings crash.
2013-08-13 06:43:09 -07:00
The Android Automerger
d4434eae68
merge in klp-release history after reset to klp-dev
2013-08-13 06:04:16 -07:00
Przemyslaw Szczepaniak
0e01f128ab
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:05:48 +01:00
Baligh Uddin
c3c89394fc
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
2013-08-13 00:56:28 -07:00
Baligh Uddin
3b3a8b0972
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
2013-08-13 00:53:52 -07:00
Baligh Uddin
b305ebe6db
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
2013-08-13 00:51:57 -07:00
Baligh Uddin
0782e6293b
am 508997ad
: (-s ours) am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
2013-08-13 00:48:30 -07:00
Baligh Uddin
c41b1e93d0
am b142c946
: (-s ours) am a45cd5a6
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
Import translations. DO NOT MERGE
2013-08-13 00:47:30 -07:00
Baligh Uddin
965d756920
am fff94ce8
: (-s ours) am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fff94ce8cc24861de614bedb193e926e62179e04':
Import translations. DO NOT MERGE
2013-08-13 00:47:21 -07:00
Baligh Uddin
508997ad07
am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
2013-08-13 00:45:32 -07:00
Baligh Uddin
fff94ce8cc
am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
2013-08-13 00:44:04 -07:00
Baligh Uddin
b142c9462f
am a45cd5a6
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a45cd5a60ef71e70c4d4530370f46766d517541a':
Import translations. DO NOT MERGE
2013-08-13 00:43:55 -07:00
Baligh Uddin
728da45580
am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7
am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
2013-08-13 00:42:11 -07:00
Tom O'Neill
e2921c9566
Settings app supports location settings injection
...
- Partial fix for b/10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
2013-08-12 16:22:48 -07:00
Maggie Benthall
3343d1aabb
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-12 18:40:45 -04:00
Baligh Uddin
f5ecf575da
Import translations. DO NOT MERGE
...
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
2013-08-12 11:54:53 -07:00
Baligh Uddin
a45cd5a60e
Import translations. DO NOT MERGE
...
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
2013-08-12 11:51:11 -07:00
Baligh Uddin
054041058f
Import translations. DO NOT MERGE
...
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
2013-08-12 11:48:59 -07:00
Baligh Uddin
03ae9bf0e9
Import translations. DO NOT MERGE
...
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
2013-08-12 11:47:40 -07:00
The Android Automerger
bc86ca6141
merge in klp-release history after reset to klp-dev
2013-08-12 06:02:34 -07:00
Zhihai Xu
9bef999b87
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
2013-08-09 18:52:07 -07:00
Zhihai Xu
eb9cecd98b
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
2013-08-09 18:49:59 -07:00
Zhihai Xu
6ee5b45080
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
2013-08-10 01:46:22 +00:00
Dianne Hackborn
0d78150a1f
am 3c7fdfd9
: am a582a051
: Proc stats UI improvements.
...
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
Proc stats UI improvements.
2013-08-09 16:49:18 -07:00
Dianne Hackborn
3c7fdfd9e9
am a582a051
: Proc stats UI improvements.
...
* commit 'a582a051951be9b1afd57e05fd6a405bccd9a46f':
Proc stats UI improvements.
2013-08-09 16:38:11 -07:00
Dianne Hackborn
a582a05195
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
2013-08-09 16:17:27 -07:00
Martijn Coenen
75d525fc88
am 0aee1b15
: am 53083ab2
: Instantiate correct classes for tap&say settings.
...
* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
Instantiate correct classes for tap&say settings.
2013-08-09 15:54:17 -07:00
Geoffrey Borggaard
a934cff8eb
am 863b8839
: am fc6bc201
: Allow navigation to TrustedCredentials User Certs by intent.
...
* commit '863b8839c7685554b41f3143472a6f379fd29ad1':
Allow navigation to TrustedCredentials User Certs by intent.
2013-08-09 15:54:16 -07:00
Dianne Hackborn
19d80679a6
am b690af54
: am f3796d0b
: Merge "Improve process stats UI." into klp-dev
...
* commit 'b690af54dc0c5e82d15226c5a85be713bcd25db2':
Improve process stats UI.
2013-08-09 15:54:15 -07:00
Alan Viverette
2a19a31c94
am 85c37e78
: am c0f79432
: Merge "Update captioning settings to match final design" into klp-dev
...
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
Update captioning settings to match final design
2013-08-09 15:54:15 -07:00
Matthew Xie
5b5b1e39dd
Bluetooth MAP profile - sms and mms support initial check-in
...
bug:10116530
Change-Id: I3f50e66420e53bf21a1ecba06aed6b8261ff3064
2013-08-09 15:47:10 -07:00
Martijn Coenen
0aee1b1506
am 53083ab2
: Instantiate correct classes for tap&say settings.
...
* commit '53083ab2bbcadf7f1bcbefbaa2e4ee5c85349d84':
Instantiate correct classes for tap&say settings.
2013-08-09 15:22:19 -07:00
Geoffrey Borggaard
863b8839c7
am fc6bc201
: Allow navigation to TrustedCredentials User Certs by intent.
...
* commit 'fc6bc20161edea9e93a7abcd82af5c26870c58bb':
Allow navigation to TrustedCredentials User Certs by intent.
2013-08-09 15:22:15 -07:00
Dianne Hackborn
b690af54dc
am f3796d0b
: Merge "Improve process stats UI." into klp-dev
...
* commit 'f3796d0bf8bfa3a0e4359dcdf4017961bd312dea':
Improve process stats UI.
2013-08-09 15:22:08 -07:00
Alan Viverette
85c37e78b5
am c0f79432
: Merge "Update captioning settings to match final design" into klp-dev
...
* commit 'c0f79432cff613e993a86bece93ab1ef674d9054':
Update captioning settings to match final design
2013-08-09 15:22:05 -07:00
Martijn Coenen
53083ab2bb
Instantiate correct classes for tap&say settings.
...
Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098
2013-08-09 13:41:41 -07:00
Geoffrey Borggaard
fc6bc20161
Allow navigation to TrustedCredentials User Certs by intent.
...
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
2013-08-09 16:21:08 -04:00
Dianne Hackborn
f3796d0bf8
Merge "Improve process stats UI." into klp-dev
2013-08-09 19:14:00 +00:00
Alan Viverette
c0f79432cf
Merge "Update captioning settings to match final design" into klp-dev
2013-08-09 19:11:25 +00:00