Jeff Sharkey
|
05d51e2474
|
am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '22f664084dc0885a495194a907ce4c2af36c9c54':
Move storage when formatting primary disk.
|
2015-07-08 22:37:44 +00:00 |
|
Jorim Jaggi
|
221f3771aa
|
am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '3b517b68057857a2b2552dd09e520907c809f15a':
Hide screenshot preference when assist is disabled
|
2015-07-08 22:22:13 +00:00 |
|
Jeff Sharkey
|
22f664084d
|
am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
Move storage when formatting primary disk.
|
2015-07-08 22:22:11 +00:00 |
|
Jorim Jaggi
|
3b517b6805
|
am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
Hide screenshot preference when assist is disabled
|
2015-07-08 22:08:34 +00:00 |
|
Jeff Sharkey
|
68fdb73d0c
|
am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.
|
2015-07-08 22:08:32 +00:00 |
|
Jorim Jaggi
|
b493b29101
|
Merge "Hide screenshot preference when assist is disabled" into mnc-dev
|
2015-07-08 21:59:01 +00:00 |
|
Jeff Sharkey
|
80eba76b10
|
Merge "Move storage when formatting primary disk." into mnc-dev
|
2015-07-08 21:55:44 +00:00 |
|
Amit Mahajan
|
2d2fa18279
|
am f3053c15: am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit 'f3053c15e3cb09af1e6939d2632a3476506be74a':
Remove 'do not translate' comment for string 'None'.
|
2015-07-08 21:37:53 +00:00 |
|
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 |
|
Amit Mahajan
|
f3053c15e3
|
am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit 'e08a3512bbfb9c3ab73790cf382b514ec4924397':
Remove 'do not translate' comment for string 'None'.
|
2015-07-08 21:21:57 +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 |
|
Amit Mahajan
|
e08a3512bb
|
am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '0757812525349f31d921bc877886ece7d3a44c4d':
Remove 'do not translate' comment for string 'None'.
|
2015-07-08 21:08:11 +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 |
|
Amit Mahajan
|
0757812525
|
am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
Remove 'do not translate' comment for string 'None'.
|
2015-07-08 20:53:35 +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 |
|
Amit Mahajan
|
2856c4fcbd
|
am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
|
2015-07-08 20:37:19 +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 |
|
Jorim Jaggi
|
56db978c2a
|
Hide screenshot preference when assist is disabled
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
|
2015-07-08 13:32:12 -07:00 |
|
Amit Mahajan
|
01ce80b574
|
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
|
2015-07-08 20:24:10 +00:00 |
|
Amit Mahajan
|
3cd87a2f70
|
Remove 'do not translate' comment for string 'None'.
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
|
2015-07-08 11:07:34 -07: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 |
|