Bryce Lee
3b6f9f78cf
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
...
am: 4636770f0d
* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:16:07 +00:00
Bryce Lee
4636770f0d
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
2015-10-29 07:10:15 +00:00
Bryce Lee
dc13382622
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
...
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
2015-10-28 22:21:54 -07:00
Bryce Lee
2adf45bee0
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
...
am: 0a80294c81
* commit '0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:10:41 +00:00
Bryce Lee
0a80294c81
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
2015-10-29 05:04:06 +00:00
Bryce Lee
70d4210e2e
Revert "Declare new interface for headset client bluetooth profile to query."
...
This reverts commit 694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
2015-10-29 04:58:38 +00:00
Bryce Lee
8b4f21b108
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
...
am: a841973dee
* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:45:09 +00:00
Bryce Lee
a841973dee
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
2015-10-29 04:39:08 +00:00
Bryce Lee
694251eaaa
Declare new interface for headset client bluetooth profile to query.
...
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug: 25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
2015-10-28 21:06:27 -07:00
Svetoslav Ganov
08d013d3a1
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a
...
am: 35151fbc8b
* commit '35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:24:38 +00:00
Svetoslav Ganov
35151fbc8b
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
...
am: 2658cb002a
* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
2015-10-29 01:10:46 +00:00
Anthony Hugh
41579ff8fc
Merge "Update permission label strings" into cw-e-dev
...
am: b69cab65d1
* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings
2015-10-28 18:29:06 +00:00
Anthony Hugh
b69cab65d1
Merge "Update permission label strings" into cw-e-dev
2015-10-28 18:22:41 +00:00
Ching Tzung Lin
c45009906a
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
...
am: 36da2a208e
* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:33:03 +00:00
Ching Tzung Lin
36da2a208e
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
2015-10-28 17:25:24 +00:00
Geoff Mendal
9aa91f99b2
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours
...
am: d2b3815dda -s ours
* commit 'd2b3815dda57702ebbd00a6422d21a52b0604dfa':
Import translations. DO NOT MERGE
2015-10-28 14:52:31 +00:00
Geoff Mendal
d2b3815dda
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
am: c7522c0b1c -s ours
* commit 'c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE
2015-10-28 14:43:38 +00:00
Geoff Mendal
c7522c0b1c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-10-28 14:38:11 +00:00
Geoff Mendal
bcefa34c3f
Import translations. DO NOT MERGE
...
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
2015-10-28 07:37:31 -07:00
Geoff Mendal
4c55431f51
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: a4f0ea406d -s ours
* commit 'a4f0ea406d9c4de166ec65541581666e782b3846':
Import translations. DO NOT MERGE
2015-10-28 14:29:50 +00:00
Geoff Mendal
a4f0ea406d
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-28 14:22:47 +00:00
Geoff Mendal
c3b637f8d1
Import translations. DO NOT MERGE
...
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
2015-10-28 07:21:49 -07:00
Geoff Mendal
32076214a4
Import translations. DO NOT MERGE am: b8afc77c0a -s ours
...
am: 7934d4e206 -s ours
* commit '7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
Import translations. DO NOT MERGE
2015-10-28 14:18:25 +00:00
Geoff Mendal
7934d4e206
Import translations. DO NOT MERGE
...
am: b8afc77c0a -s ours
* commit 'b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE
2015-10-28 14:11:00 +00:00
Geoff Mendal
b8afc77c0a
Import translations. DO NOT MERGE
...
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
2015-10-28 06:59:45 -07:00
Geoff Mendal
5d79e1b9c1
Import translations. DO NOT MERGE
...
am: 44036023a5 -s ours
* commit '44036023a574fa8526c6b436ff5309d5939c94cd':
Import translations. DO NOT MERGE
2015-10-28 12:21:45 +00:00
Geoff Mendal
44036023a5
Import translations. DO NOT MERGE
...
Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import
2015-10-28 05:13:26 -07:00
Daniel Sandler
638003c4fd
Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21
...
am: 21858e56d6 -s ours
* commit '21858e56d640109e36b2f02e244e125adf37020c':
Petites fautes.
2015-10-28 03:21:35 +00:00
Svetoslav
01af6a42a6
Make SYSTEM_ALERT_WINDOW development permission
...
bug:25329324
Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
2015-10-27 18:12:06 -07:00
Anthony Hugh
0e98ac74f1
Update permission label strings
...
Updates permission labels to have more consistent
grammar and capitalization.
BUG: 23760467
Change-Id: I61c2f9c72fdf4318e1773f3e0385fb86e0d65f69
2015-10-27 14:13:42 -07:00
Daniel Sandler
21858e56d6
Merge "Petites fautes." into mnc-dr-dev
...
am: da43cc0a21
* commit 'da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
Petites fautes.
2015-10-27 20:00:01 +00:00
Dianne Hackborn
40bced1d6e
Fix issue #25289999 : Lower device idle alarm limit to 10 mins. am: 7682b26ea1
...
am: 26654c92ca
* commit '26654c92caf3d5443e2d7a50fc3573e8d81446d8':
Fix issue #25289999 : Lower device idle alarm limit to 10 mins.
2015-10-27 19:55:02 +00:00
Daniel Sandler
da43cc0a21
Merge "Petites fautes." into mnc-dr-dev
2015-10-27 19:51:31 +00:00
Dianne Hackborn
26654c92ca
Fix issue #25289999 : Lower device idle alarm limit to 10 mins.
...
am: 7682b26ea1
* commit '7682b26ea164ba1078495e24910f22d73766c192':
Fix issue #25289999 : Lower device idle alarm limit to 10 mins.
2015-10-27 19:46:12 +00:00
Dan Sandler
aa1c08014e
Petites fautes.
...
Bug: 25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed
2015-10-27 13:42:55 -04:00
Dianne Hackborn
7682b26ea1
Fix issue #25289999 : Lower device idle alarm limit to 10 mins.
...
This helps with some cases where perisistent network connections
need a more frequent keep alive signal. Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.
Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be
2015-10-27 10:23:38 -07:00
Geoff Mendal
515e97a52c
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 337495bded -s ours
* commit '337495bded9c4035a922274143c1ab119e692bdd':
Import translations. DO NOT MERGE
2015-10-26 19:44:27 +00:00
Geoff Mendal
ad3bd48dfe
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: db4f28692a -s ours
* commit 'db4f28692aacccb57d64f86b3dfd4205bafebf9b':
Import translations. DO NOT MERGE
2015-10-26 19:42:59 +00:00
Geoff Mendal
fe4a48c010
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 9865051825 -s ours
* commit '9865051825fbc709510deefa129c4210fadf057a':
Import translations. DO NOT MERGE
2015-10-26 19:40:56 +00:00
Geoff Mendal
337495bded
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-26 19:36:01 +00:00
Geoff Mendal
db4f28692a
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-26 19:35:20 +00:00
Geoff Mendal
9865051825
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-26 19:35:02 +00:00
Geoff Mendal
7976a3fbf4
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 8961b24ff2 -s ours
* commit '8961b24ff2541fc246e275ae3cc4cdda64934462':
Import translations. DO NOT MERGE
2015-10-26 19:08:26 +00:00
Geoff Mendal
e8be87e96f
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 4917e9dd1c -s ours
* commit '4917e9dd1c727a003e9636e4c78c3f5c1aad7402':
Import translations. DO NOT MERGE
2015-10-26 19:06:53 +00:00
Geoff Mendal
6b3e7808d6
Import translations. DO NOT MERGE
...
Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import
2015-10-26 12:06:21 -07:00
Geoff Mendal
76941becab
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 82b5276866 -s ours
* commit '82b52768667a16a6ef02b2d9aa9cd171f547331a':
Import translations. DO NOT MERGE
2015-10-26 19:04:39 +00:00
Geoff Mendal
48dfdda0e9
Import translations. DO NOT MERGE
...
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
2015-10-26 12:04:18 -07:00
Geoff Mendal
79c07f4c63
Import translations. DO NOT MERGE
...
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
2015-10-26 12:02:09 -07:00
Geoff Mendal
8961b24ff2
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-10-26 18:59:41 +00:00
