Sanket Padawe
|
5418ef080b
|
am d49fbb37: am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'd49fbb372a504b1644b8880da59108a3816f6f36':
Locale based string changes in BT.
|
2015-07-08 21:37:52 +00:00 |
|
Sanket Padawe
|
0c9d1b7ba3
|
am 0af7dec8: am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '0af7dec8b5c9916c5c05c565d365f6871f35bbf6':
Disable CA certificate for EAP-SIM, AKA & AKA'
|
2015-07-08 21:37:51 +00:00 |
|
Robin Lee
|
d3e81eb74a
|
am 243a53cd: am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '243a53cd6e3af7e52d5e00bbb1841bedf038f477':
Restore Vpn advanced options on re-init or rotate
|
2015-07-08 21:37:50 +00:00 |
|
Sanket Padawe
|
d49fbb372a
|
am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '012876e400d573c9f2deb3c076c611f651e6e2ec':
Locale based string changes in BT.
|
2015-07-08 21:21:56 +00:00 |
|
Sanket Padawe
|
0af7dec8b5
|
am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit 'bd19918f87903031b6c32057a347d3759d9f1aca':
Disable CA certificate for EAP-SIM, AKA & AKA'
|
2015-07-08 21:21:55 +00:00 |
|
Sanket Padawe
|
012876e400
|
am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
Locale based string changes in BT.
|
2015-07-08 21:08:09 +00:00 |
|
Sanket Padawe
|
bd19918f87
|
am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '3dfe8963e6d2a02818a22f6a063fb671e7560d10':
Disable CA certificate for EAP-SIM, AKA & AKA'
|
2015-07-08 21:08:08 +00:00 |
|
Sanket Padawe
|
beb277de3c
|
am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
Locale based string changes in BT.
|
2015-07-08 20:53:32 +00:00 |
|
Sanket Padawe
|
3dfe8963e6
|
am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit 'f7a64d206869ef783820f08966ad3bbf8ebe4559':
Disable CA certificate for EAP-SIM, AKA & AKA'
|
2015-07-08 20:53:31 +00:00 |
|
Sanket Padawe
|
a63ee14f45
|
am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
|
2015-07-08 20:37:18 +00:00 |
|
Sanket Padawe
|
f7a64d2068
|
am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
|
2015-07-08 20:37:16 +00:00 |
|
Sanket Padawe
|
c7777b9470
|
Merge "Locale based string changes in BT." into mnc-dev
|
2015-07-08 17:15:57 +00:00 |
|
Sanket Padawe
|
c9cdf9c814
|
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
|
2015-07-08 17:14:55 +00:00 |
|
Robin Lee
|
243a53cd6e
|
am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit 'a0c850f24930ce6ad240e2a12aaf8ad020a7c561':
Restore Vpn advanced options on re-init or rotate
|
2015-07-08 17:07:36 +00:00 |
|
Robin Lee
|
a0c850f249
|
am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit 'd81d249af4b5384c8caf8a2c3b3923684714193d':
Restore Vpn advanced options on re-init or rotate
|
2015-07-08 16:54:55 +00:00 |
|
Geoff Mendal
|
58b516f916
|
am 4dac1089: (-s ours) am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4dac108977026b0fdf943b74f443cc127a4c8cd9':
Import translations. DO NOT MERGE
|
2015-07-08 16:46:10 +00:00 |
|
Robin Lee
|
d81d249af4
|
am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
|
2015-07-08 16:40:44 +00:00 |
|
Geoff Mendal
|
4dac108977
|
am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd1a87a4a39d588ed320df69dde741968cb41da20':
Import translations. DO NOT MERGE
|
2015-07-08 16:33:55 +00:00 |
|
Robin Lee
|
e46e48271a
|
am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
|
2015-07-08 16:27:42 +00:00 |
|
Geoff Mendal
|
d1a87a4a39
|
am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd0249808fd8c1dd98b2cbe028a0448fda2e129ec':
Import translations. DO NOT MERGE
|
2015-07-08 16:19:49 +00:00 |
|
Robin Lee
|
64e1e15d10
|
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
|
2015-07-08 16:17:23 +00:00 |
|
Geoff Mendal
|
d0249808fd
|
am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
Import translations. DO NOT MERGE
|
2015-07-08 16:06:29 +00:00 |
|
Geoff Mendal
|
661dbf01b7
|
am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
|
2015-07-08 15:50:58 +00:00 |
|
Geoff Mendal
|
4a332ee8ed
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-07-08 15:39:32 +00:00 |
|
Geoff Mendal
|
2b374308fe
|
Merge "Import translations. DO NOT MERGE"
|
2015-07-08 15:28:26 +00:00 |
|
Geoff Mendal
|
5a416db19e
|
Import translations. DO NOT MERGE
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
|
2015-07-08 08:19:19 -07:00 |
|
Jason Monk
|
b2f2d45af4
|
am d355c893: am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit 'd355c8935840d69c87f37154c33dc1f5b0dfcebb':
Handle uninstall from notifications list
|
2015-07-08 15:16:55 +00:00 |
|
Zoltan Szatmary-Ban
|
f601bec35e
|
am 87e918cd: am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '87e918cdf0ff92c8beee43b9f0be514d608c7b4c':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
|
2015-07-08 15:16:29 +00:00 |
|
Zoltan Szatmary-Ban
|
df57fa52ab
|
resolved conflicts for merge of 8eade69d to master
Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b
|
2015-07-08 16:05:49 +01:00 |
|
Geoff Mendal
|
4a1433e375
|
Import translations. DO NOT MERGE
Change-Id: I12aef3de5553a5aae064a8b40dc99a869ed02d90
Auto-generated-cl: translation import
|
2015-07-08 07:41:58 -07:00 |
|
Jason Monk
|
d355c89358
|
am 90c48a41: am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '90c48a4134af1c654c975369f00e497799fece38':
Handle uninstall from notifications list
|
2015-07-08 14:27:28 +00:00 |
|
Jason Monk
|
90c48a4134
|
am e14fc96a: am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit 'e14fc96a9c30019c4e091eef302dc407b5cd7536':
Handle uninstall from notifications list
|
2015-07-08 14:11:45 +00:00 |
|
Jason Monk
|
e14fc96a9c
|
am fa10637f: am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit 'fa10637f2b42ba0d4cc81e6bb0f0a13eaf335e79':
Handle uninstall from notifications list
|
2015-07-08 13:57:40 +00:00 |
|
Jason Monk
|
fa10637f2b
|
am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
|
2015-07-08 13:44:38 +00:00 |
|
Jason Monk
|
4652115f1f
|
Merge "Handle uninstall from notifications list" into mnc-dev
|
2015-07-08 13:34:41 +00:00 |
|
Zoltan Szatmary-Ban
|
87e918cdf0
|
am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '2f279c3a12e58806d8efb48bbeef031842a0ed80':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
|
2015-07-08 12:55:35 +00:00 |
|
Zoltan Szatmary-Ban
|
8eade69d74
|
am 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
Making Settings > Storage multiprofile aware
|
2015-07-08 12:55:10 +00:00 |
|
Zoltan Szatmary-Ban
|
2f279c3a12
|
am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '2cd50c45da99fa002375ad80a51d0c672cc09572':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
|
2015-07-08 12:25:55 +00:00 |
|
Zoltan Szatmary-Ban
|
2cd50c45da
|
am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
|
2015-07-08 12:12:30 +00:00 |
|
Zoltan Szatmary-Ban
|
03b7306812
|
am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
|
2015-07-08 11:57:34 +00:00 |
|
Zoltan Szatmary-Ban
|
296e0aff02
|
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
|
2015-07-08 11:45:04 +00:00 |
|
Zoltan Szatmary-Ban
|
89be2eeab0
|
am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '38a510df76a596007d9425270d8a927018dc2ae2':
Making Settings > Storage multiprofile aware
|
2015-07-08 11:37:51 +00:00 |
|
Zoltan Szatmary-Ban
|
38a510df76
|
am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
|
2015-07-08 11:25:44 +00:00 |
|
Zoltan Szatmary-Ban
|
215af28895
|
am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
|
2015-07-08 11:10:45 +00:00 |
|
Zoltan Szatmary-Ban
|
461a48bac9
|
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
|
2015-07-08 10:54:19 +00:00 |
|
Wei Liu
|
918286ff60
|
am d5e276fa: am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
* commit 'd5e276fa6e53ab940bec3af0610df3daae2c0052':
Move NetworkPolicyEditor from Settings packge to settingslib.
|
2015-07-08 02:06:51 +00:00 |
|
Christopher Tate
|
4ce5b0e3b9
|
am 0556a0a9: am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '0556a0a94974f202c92d9f31fa86b00857c51ab9':
App link handling is not just for "official" verified handlers
|
2015-07-08 02:06:49 +00:00 |
|
Amith Yamasani
|
0c777692e1
|
am 4a902ffd: am 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '4a902ffd0b8b19493d5079bd75faed6a61f580c6':
Use localized name for guest user
|
2015-07-08 02:06:48 +00:00 |
|
Wei Liu
|
d5e276fa6e
|
am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
* commit '27e395427eef95fea47f06b5cc7bbba0e7853016':
Move NetworkPolicyEditor from Settings packge to settingslib.
|
2015-07-08 01:40:05 +00:00 |
|
Christopher Tate
|
0556a0a949
|
am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '6c444a03f671eb4439792506f09efe8b6b3fdb59':
App link handling is not just for "official" verified handlers
|
2015-07-08 01:39:59 +00:00 |
|