Geoff Mendal
8b41305696
Import translations. DO NOT MERGE am: f6fc9e2152 -s ours
...
am: 432eb8e686 -s ours
* commit '432eb8e686ce1f4f993b74be73ec035341fa4599':
Import translations. DO NOT MERGE
2015-10-26 14:42:15 +00:00
Geoff Mendal
432eb8e686
Import translations. DO NOT MERGE
...
am: f6fc9e2152 -s ours
* commit 'f6fc9e215292945ef3add558e513e5eef01acbfe':
Import translations. DO NOT MERGE
2015-10-26 14:31:12 +00:00
Geoff Mendal
f6fc9e2152
Import translations. DO NOT MERGE
...
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
2015-10-26 07:17:06 -07:00
Geoff Mendal
a0b24e64d0
Import translations. DO NOT MERGE
...
am: a1ecb9ee2b -s ours
* commit 'a1ecb9ee2b51a858d8bba73d31de6611a178f2e6':
Import translations. DO NOT MERGE
2015-10-26 12:24:45 +00:00
Geoff Mendal
a1ecb9ee2b
Import translations. DO NOT MERGE
...
Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import
2015-10-26 05:11:27 -07:00
Puneet Kumar
b0482fe29e
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b
...
am: fc12c7c1b7
* commit 'fc12c7c1b7ecd71517feb70ec4fe027545fda4c2':
Prevent recents from coming up when in SUW
2015-10-24 15:50:08 +00:00
Puneet Kumar
fc12c7c1b7
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
...
am: ca9c43b27b
* commit 'ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
Prevent recents from coming up when in SUW
2015-10-24 15:42:33 +00:00
Puneet Kumar
ca9c43b27b
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
2015-10-24 15:20:28 +00:00
Michael Wright
d847ad5555
Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
2015-10-24 13:24:15 +01:00
Dan Sandler
a540cbd00f
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7
...
am: 06eb98c04d
* commit '06eb98c04d82cd7f6094aca738fc449d4f8af3fd':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 01:21:05 +00:00
Dan Sandler
06eb98c04d
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509
...
am: 493272c8a7
* commit '493272c8a7e7219f947a222cd71aaaf3d4bc3c0a':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:58:58 +00:00
Dan Sandler
493272c8a7
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours
...
am: e68e70d509
* commit 'e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:45:01 +00:00
Dan Sandler
681a397716
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747
...
am: e41b3b35b5
* commit 'e41b3b35b51431e897847e8b6646c27def5f573b':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:44:27 +00:00
Dan Sandler
e68e70d509
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b
...
am: 7e16b2e8f5 -s ours
* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:33:48 +00:00
Dan Sandler
e41b3b35b5
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b
...
am: d9a96ff747
* commit 'd9a96ff7475a85ed60b42f96115db634e8c313cf':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:33:33 +00:00
Dan Sandler
7e16b2e8f5
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b
...
am: 511357c39b
* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:15:49 +00:00
Dan Sandler
d9a96ff747
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours
...
am: ab4857790b
* commit 'ab4857790bc84388817c0bec8c4010d660f35ada':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:15:44 +00:00
Dan Sandler
ab4857790b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
...
am: 6c3186ea07 -s ours
* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:17 +00:00
Dan Sandler
625c731ccd
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755
...
am: 5da8453866
* commit '5da84538668c03b61ff31ceb679f4f3b12726351':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:16 +00:00
Dan Sandler
511357c39b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours
...
am: 410bea181b
* commit '410bea181b229adef7a2c1a9308379eead260706':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
...
am: 6026b5b17e
* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
...
am: b1de85487a -s ours
* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:54 +00:00
Dan Sandler
5da8453866
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7
...
am: 4db8c18755
* commit '4db8c187551bd238b50a85a7be3be6595a69a2ed':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:43 +00:00
Dan Sandler
6026b5b17e
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 51c2619c77
* commit '51c2619c7706575a171cf29819db14e91b815a62':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:50 +00:00
Dan Sandler
4db8c18755
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 446dcc9ed7
* commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:39 +00:00
Dan Sandler
b1de85487a
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 1044e162c3
* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:22 +00:00
xin He
c49f5c83cb
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765
...
am: 910e447d96
* commit '910e447d96732ad22582efb6cea08925dc21e55c':
[DO NOT MERGE] EAP-TLS PMKID mismatch error
2015-10-23 20:59:36 +00:00
Bryce Lee
998afcb738
Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev
...
am: 434a1fd687
* commit '434a1fd68754e554b331d26d0c684209eaa42fa9':
Add config flag for reloading supported profiles in bluetooth on enable.
2015-10-23 20:58:15 +00:00
xin He
910e447d96
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
...
am: 3b47afe765
* commit '3b47afe7656eb16e8ddb04d771a18eab678c125f':
[DO NOT MERGE] EAP-TLS PMKID mismatch error
2015-10-23 20:53:48 +00:00
Bryce Lee
434a1fd687
Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev
2015-10-23 20:52:44 +00:00
xin He
3b47afe765
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
2015-10-23 20:45:24 +00:00
xinhe
2452e54de6
[DO NOT MERGE] EAP-TLS PMKID mismatch error
...
b/24253154
Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
2015-10-23 12:56:25 -07:00
Bryce Lee
c17bbe0be2
Add config flag for reloading supported profiles in bluetooth on enable.
...
Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
2015-10-23 12:32:07 -07:00
Ching Tzung Lin
9cae56e7b6
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev
...
am: e94b3ba099
* commit 'e94b3ba0994d52eccc7f0ed797ee1b3541f3ae83':
Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
2015-10-23 18:13:01 +00:00
Ching Tzung Lin
e94b3ba099
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev
2015-10-23 18:05:52 +00:00
Adrian Roos
5e5f718d23
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129
...
am: a53bbb652b
* commit 'a53bbb652b875e02ce8e5cfd55591adeac033417':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:38:17 +00:00
Adrian Roos
a53bbb652b
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
...
am: 93a6b4c129
* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
93a6b4c129
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
2015-10-23 17:21:23 +00:00
Dianne Hackborn
6ff08bd48c
Merge "DO NOT MERGE Fix issue #24118803 : The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23
...
am: 9161871f83
* commit '9161871f8374a3d3ec184dd1c716d117e06381c6':
DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off...
2015-10-23 17:19:47 +00:00
Dianne Hackborn
9161871f83
Merge "DO NOT MERGE Fix issue #24118803 : The screen doesn\'t turn off..." into mnc-dr-dev
...
am: b32e020d23
* commit 'b32e020d237cfd94cdfe8c589900a899dc14413a':
DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off...
2015-10-23 17:09:45 +00:00
Dianne Hackborn
b32e020d23
Merge "DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off..." into mnc-dr-dev
2015-10-23 17:04:55 +00:00
Sungmin Choi
b932dc5253
Remove tether_apndata for Sasktel am: a665ea7207
...
am: af745653d0
* commit 'af745653d0809d7f9545cebf8727ea8c75990fd1':
Remove tether_apndata for Sasktel
2015-10-23 03:33:29 +00:00
Sungmin Choi
af745653d0
Remove tether_apndata for Sasktel
...
am: a665ea7207
* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
Remove tether_apndata for Sasktel
2015-10-23 03:26:18 +00:00
Dan Sandler
1044e162c3
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
2015-10-23 01:37:52 +00:00
Adrian Roos
0450565d9a
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Dianne Hackborn
7730cd2740
DO NOT MERGE Fix issue #24118803 : The screen doesn't turn off...
...
...after more than 60 minutes left
The sensing timeout alarm was being cancelled immediately after it
was scheduled it. Now only cancel it when we are done sensing or
have reset activity.
Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af
2015-10-22 17:40:23 -07:00
Sungmin Choi
a665ea7207
Remove tether_apndata for Sasktel
...
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).
BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
2015-10-22 16:59:44 -07:00
Ian Pedowitz
07129d53b5
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90
...
am: b402735fc0
* commit 'b402735fc0eb246233814bce76118fba99bb9f87':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:38:56 +00:00
