Jeff Sharkey
|
c87ea48a61
|
am 4f0205d3: am 6b09d2c9: (-s ours) am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '4f0205d31484dd9c3a4cca7c82434b3410f785c9':
|
2015-08-27 20:15:27 +00:00 |
|
Amit Mahajan
|
28e3161462
|
am 3876ef95: am 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '3876ef95cada8d7b31f9cac2ad917da6d5acf685':
|
2015-08-27 20:15:24 +00:00 |
|
Sanket Padawe
|
cd716d0f3e
|
am 2ea49864: am 2d633c97: (-s ours) am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '2ea4986406daead1ffa2cd56f4caae048655abb5':
|
2015-08-27 20:15:12 +00:00 |
|
Sanket Padawe
|
66956ebe7a
|
am 0e67389f: am 88701273: (-s ours) am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '0e67389f254ec5ce4782f076b3a259e2a795fdc2':
|
2015-08-27 20:15:08 +00:00 |
|
Robin Lee
|
82865eb9af
|
am 6d557943: am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '6d557943277e3eac5b65be3f8d50ff5b0b1450e1':
|
2015-08-27 20:15:04 +00:00 |
|
Geoff Mendal
|
bcf7035bd5
|
am 62b24c74: (-s ours) am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '62b24c74a9579dc9e76f4de268084ebbffe5f0fd':
|
2015-08-27 20:15:01 +00:00 |
|
Jason Monk
|
b103a2d158
|
am 06bb8569: am 49c78619: (-s ours) am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '06bb8569a2a8f79ea25d6691cdc56abbd6053e7c':
|
2015-08-27 20:14:58 +00:00 |
|
Zoltan Szatmary-Ban
|
841a1c7430
|
am dc8fcbab: am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit 'dc8fcbabe7b82a2f4af8d161f15ca57e05231024':
|
2015-08-27 20:14:55 +00:00 |
|
Zoltan Szatmary-Ban
|
7c97cd1c4e
|
am 1a04072c: am e78d9ab7: (-s ours) am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '1a04072c47cbaa253efdd6d1b8d1113c1cdf9f03':
|
2015-08-27 20:14:52 +00:00 |
|
Christopher Tate
|
9dc13782e3
|
am 7cf1e6da: am 2db668d5: (-s ours) am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '7cf1e6daa2607f2b75a4c2028e2fb680239325b0':
|
2015-08-27 20:14:50 +00:00 |
|
Amith Yamasani
|
6ebf0f602d
|
am 1160846a: am 5ce2a7f5: (-s ours) am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '1160846ac45f740908262f90547660af65dc6e32':
|
2015-08-27 20:14:49 +00:00 |
|
Jorim Jaggi
|
e531bb4dcc
|
am 6ea21ffb: am 09c30740: (-s ours) am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '6ea21ffb72cf0107565a5fd2cc6630157b71b9a6':
|
2015-08-27 20:14:48 +00:00 |
|
Jeff Sharkey
|
919cfad8c8
|
am cf82dbec: am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit 'cf82dbec38e70aa9a4ae0eb99ad4cbf4b7ae6d83':
|
2015-08-27 20:14:47 +00:00 |
|
Jeff Sharkey
|
f99809091b
|
am 22bf2806: am 139e1964: (-s ours) am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '22bf2806b4bfe4d31d94c2adbfa2d4bac3b25d9f':
|
2015-08-27 20:14:46 +00:00 |
|
Geoff Mendal
|
13b3b51483
|
am 19f5403a: (-s ours) am 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '19f5403aedfc6e0ac66fa92422096890cdbe49b5':
|
2015-08-27 20:14:44 +00:00 |
|
Jeff Sharkey
|
4f0205d314
|
am 6b09d2c9: (-s ours) am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '6b09d2c9825a0936027e509f36ad04ccc12883d5':
|
2015-08-27 11:31:25 +00:00 |
|
Amit Mahajan
|
3876ef95ca
|
am 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '5fc2772b5d3486f2b7ad48556ff945a0b3e267e5':
|
2015-08-27 11:31:23 +00:00 |
|
Sanket Padawe
|
2ea4986406
|
am 2d633c97: (-s ours) am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '2d633c9744a0b2ae7373068cdca752777df439d1':
|
2015-08-27 11:31:22 +00:00 |
|
Sanket Padawe
|
0e67389f25
|
am 88701273: (-s ours) am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '88701273e3056d86fb2f442400de9dec994d669e':
|
2015-08-27 11:31:20 +00:00 |
|
Robin Lee
|
6d55794327
|
am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit 'd1e93240aadca200462de351415abed5e856b58c':
|
2015-08-27 11:31:17 +00:00 |
|
Geoff Mendal
|
62b24c74a9
|
am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '74d8ac2e274f0a19f5164191e8dd00dd8e741428':
|
2015-08-27 11:31:14 +00:00 |
|
Jason Monk
|
06bb8569a2
|
am 49c78619: (-s ours) am 4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '49c7861984dfe4bf4516a5666995e3b36c0f7fd7':
|
2015-08-27 11:31:10 +00:00 |
|
Zoltan Szatmary-Ban
|
dc8fcbabe7
|
am 909ddcca: (-s ours) am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '909ddcca43803078c838da0c6b9a9c84ddb715a6':
|
2015-08-27 11:31:07 +00:00 |
|
Zoltan Szatmary-Ban
|
1a04072c47
|
am e78d9ab7: (-s ours) am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit 'e78d9ab78f379cfa4e9ada05115ffc16621f1d5e':
|
2015-08-27 11:31:02 +00:00 |
|
Christopher Tate
|
7cf1e6daa2
|
am 2db668d5: (-s ours) am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '2db668d547674e787f2c8fef101c7385ad9677a6':
|
2015-08-27 11:30:57 +00:00 |
|
Amith Yamasani
|
1160846ac4
|
am 5ce2a7f5: (-s ours) am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '5ce2a7f5c46ddced28400f62f4daa87269fc5ff5':
|
2015-08-27 11:30:42 +00:00 |
|
Jorim Jaggi
|
6ea21ffb72
|
am 09c30740: (-s ours) am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '09c307401893886a7d82baa520f33d6956b56de4':
|
2015-08-27 11:30:36 +00:00 |
|
Jeff Sharkey
|
cf82dbec38
|
am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '31d519fe37f6132f01b6193fec91d9f9b5b97908':
|
2015-08-27 11:30:29 +00:00 |
|
Jeff Sharkey
|
22bf2806b4
|
am 139e1964: (-s ours) am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '139e19647169a736d1f8b1b71479bd36742a2341':
|
2015-08-27 11:30:22 +00:00 |
|
Geoff Mendal
|
19f5403aed
|
am 479b00cd: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '479b00cd40c0173ba3e51f072efa0aa5e432234c':
|
2015-08-27 11:30:06 +00:00 |
|
Julia Reynolds
|
8d731a62d4
|
Merge "Use common extra names when launching external config."
|
2015-08-26 18:47:08 +00:00 |
|
Fyodor Kupolov
|
9983991ed4
|
Merge "Renamed primaryUserOnly to systemUserOnly"
|
2015-08-26 17:25:52 +00:00 |
|
Geoff Mendal
|
23a13d5167
|
am 6d9b908a: (-s ours) am ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '6d9b908a31702ff1d6d8ea98ad1817c58fbeaf12':
Import translations. DO NOT MERGE
|
2015-08-26 14:44:04 +00:00 |
|
Geoff Mendal
|
6d9b908a31
|
am ebf23a76: (-s ours) am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit 'ebf23a763f240b203480d53bc29895d14e230f89':
Import translations. DO NOT MERGE
|
2015-08-26 14:33:36 +00:00 |
|
Geoff Mendal
|
ebf23a763f
|
am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '3b545b41b931919fab3528e2bbb81ded620378b2':
Import translations. DO NOT MERGE
|
2015-08-26 14:25:58 +00:00 |
|
Geoff Mendal
|
3b545b41b9
|
am fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit 'fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
Import translations. DO NOT MERGE
|
2015-08-26 14:19:37 +00:00 |
|
Geoff Mendal
|
fbfdede15b
|
Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
|
2015-08-26 07:12:08 -07:00 |
|
Geoff Mendal
|
5dda1fa870
|
Import translations. DO NOT MERGE
Change-Id: Ib5bcf56683aab565a59b874cf85529d4dd2d2fb6
Auto-generated-cl: translation import
|
2015-08-26 06:21:28 -07:00 |
|
Yasuhiro Matsuda
|
a5c73b423d
|
Merge "Handle the case where null is returned for USB_STATE intent."
|
2015-08-26 09:36:41 +00:00 |
|
Yasuhiro Matsuda
|
ea37281d9e
|
Merge "Handle the case where USB_STATE intent is not received yet."
|
2015-08-26 09:36:41 +00:00 |
|
Fyodor Kupolov
|
25f1f6086c
|
Renamed primaryUserOnly to systemUserOnly
Bug: 22958572
Change-Id: Iaea879e76ec24c1b18446addd4d575514c94625b
|
2015-08-25 18:22:53 -07:00 |
|
Jim Miller
|
8b8ac00d84
|
am e3f8ef83: am d63408d9: am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit 'e3f8ef8333fbf916d608d950b594135b760bbda5':
Don't attempt to remove fp templates if none are enrolled
|
2015-08-25 23:37:53 +00:00 |
|
Jim Miller
|
e3f8ef8333
|
am d63408d9: am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit 'd63408d91576277acec9c2169e48eff839516470':
Don't attempt to remove fp templates if none are enrolled
|
2015-08-25 23:33:55 +00:00 |
|
Jim Miller
|
d63408d915
|
am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit 'd7e4cd9b1edb25651d3fa306e389b7ec858c1ed8':
Don't attempt to remove fp templates if none are enrolled
|
2015-08-25 23:25:08 +00:00 |
|
Jim Miller
|
d7e4cd9b1e
|
am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
Don't attempt to remove fp templates if none are enrolled
|
2015-08-25 23:18:54 +00:00 |
|
Jim Miller
|
f7fc642987
|
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
|
2015-08-25 23:08:55 +00:00 |
|
Julia Reynolds
|
3692a5abe1
|
Use common extra names when launching external config.
Bug: 22977552
Change-Id: Ib91bcea76598cb5e712ad0c1f0a5cd1f9dc16fbe
|
2015-08-25 14:55:54 -04:00 |
|
Wei Liu
|
9dde0669f2
|
am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
Refactor UidDetailProvider and its dependencies to SettingsLib.
|
2015-08-25 18:45:34 +00:00 |
|
Wei Liu
|
656c805bf3
|
am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '702381144781d68551e765dcf8b23cf3dbca3ce5':
Refactor UidDetailProvider and its dependencies to SettingsLib.
|
2015-08-25 18:37:40 +00:00 |
|
Wei Liu
|
7023811447
|
am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '6e58d516f05bbceabdddd3aa08a94fcc32858e71':
Refactor UidDetailProvider and its dependencies to SettingsLib.
|
2015-08-25 18:32:41 +00:00 |
|