Geoff Mendal
|
1d48a687cf
|
am 458a9bfd: (-s ours) am 88afe4a4: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '458a9bfd40dc895ea624e0539e0d75f1080abcd6':
|
2015-08-27 20:16:18 +00:00 |
|
Robin Lee
|
567bc04e47
|
am 248f0d64: am 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '248f0d640c2d683f456235515544907af0a9f02c':
|
2015-08-27 20:16:14 +00:00 |
|
Rubin Xu
|
e94e74af74
|
am dc87b105: am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit 'dc87b1052370a4c1966dbc70856869359df37e03':
|
2015-08-27 20:16:08 +00:00 |
|
Jason Monk
|
f69cef28b9
|
am 9f42b595: am 4484cc4f: (-s ours) am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '9f42b59567d7e62fdab7cf40a9136d9a2b8b3453':
|
2015-08-27 20:16:04 +00:00 |
|
Julia Reynolds
|
81914fee68
|
am 60717d23: am bc79da2b: (-s ours) am ddd887af: Prevent crash when removing an account.
* commit '60717d23ec4d5c3fab71270532c7a6e415b71665':
|
2015-08-27 20:16:01 +00:00 |
|
Julia Reynolds
|
36c9e57adb
|
am aa4abafb: am 46ea05da: (-s ours) am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit 'aa4abafbc2e091e4c204131ada1f8b9766df96e0':
|
2015-08-27 20:15:57 +00:00 |
|
Jason Monk
|
78531a3bea
|
am 36d5e562: am dee0d05b: (-s ours) am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '36d5e562dd8677e16a3478d63e68435637ed9409':
|
2015-08-27 20:15:53 +00:00 |
|
Jason Monk
|
6f622f3c53
|
am 0baaeec3: am 296aec41: (-s ours) am b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '0baaeec3b897b095a82a7cc29e299012ca815b09':
|
2015-08-27 20:15:48 +00:00 |
|
Zoltan Szatmary-Ban
|
b59aa5b237
|
am d49d0322: am b0afdf2f: (-s ours) am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit 'd49d03228d3c094101114fe5def29fdf37c7d024':
|
2015-08-27 20:15:44 +00:00 |
|
Zoltan Szatmary-Ban
|
767d727ec7
|
am 4be34602: am b0a8c420: (-s ours) am 4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '4be3460262b7724e58397e7296857a2bd6011e09':
|
2015-08-27 20:15:40 +00:00 |
|
Sasha Levitskiy
|
c7a72f062d
|
am 544932fc: am a5251bbc: (-s ours) am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '544932fc4a444c10458844366076c0211e3ecbe4':
|
2015-08-27 20:15:37 +00:00 |
|
Tim Kilbourn
|
017f765316
|
am c2d6851a: am ad1aa525: (-s ours) am 49983b99: Show correct text for app link domains.
* commit 'c2d6851ac5cb343aab5ff12265a1a9159b2a7bde':
|
2015-08-27 20:15:33 +00:00 |
|
Jorim Jaggi
|
a7761cd105
|
am 8107a3b1: am 221e0f44: (-s ours) am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '8107a3b1e2fbed4c065a8b44a41254ea8b6e9414':
|
2015-08-27 20:15:30 +00:00 |
|
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 |
|
Geoff Mendal
|
458a9bfd40
|
am 88afe4a4: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE
* commit '88afe4a4d7e4cb876908c1898f610dabbd5c7202':
|
2015-08-27 11:31:51 +00:00 |
|
Robin Lee
|
248f0d640c
|
am 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '27c45eb9f24a6fe12ad61199b90bb8fdbd0df4db':
|
2015-08-27 11:31:50 +00:00 |
|
Rubin Xu
|
dc87b10523
|
am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '20eb7e10f27f564cb40ad5f0398fb2e8c17d897a':
|
2015-08-27 11:31:48 +00:00 |
|
Jason Monk
|
9f42b59567
|
am 4484cc4f: (-s ours) am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '4484cc4ff4c1bef78ac52d8abd8351b09a9a1e1b':
|
2015-08-27 11:31:46 +00:00 |
|
Julia Reynolds
|
60717d23ec
|
am bc79da2b: (-s ours) am ddd887af: Prevent crash when removing an account.
* commit 'bc79da2b3e32fe86628e61aedba57d391053a382':
|
2015-08-27 11:31:44 +00:00 |
|
Julia Reynolds
|
aa4abafbc2
|
am 46ea05da: (-s ours) am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '46ea05da72db4719faed1c3ec173448d7a2f0706':
|
2015-08-27 11:31:42 +00:00 |
|
Jason Monk
|
36d5e562dd
|
am dee0d05b: (-s ours) am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit 'dee0d05b5c6797b860fef9e6591249391956edc3':
|
2015-08-27 11:31:39 +00:00 |
|
Jason Monk
|
0baaeec3b8
|
am 296aec41: (-s ours) am b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '296aec4127468ca79c1db60672a2cb0d39e3b0c1':
|
2015-08-27 11:31:37 +00:00 |
|
Zoltan Szatmary-Ban
|
d49d03228d
|
am b0afdf2f: (-s ours) am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit 'b0afdf2f5ab38b947cee443979d9833bd1af03c2':
|
2015-08-27 11:31:34 +00:00 |
|
Zoltan Szatmary-Ban
|
4be3460262
|
am b0a8c420: (-s ours) am 4bbe3d1f: Update all shown preferences in Settings > Storage
* commit 'b0a8c4203c859ee26d1989387e0406d0a86da6f5':
|
2015-08-27 11:31:32 +00:00 |
|
Sasha Levitskiy
|
544932fc4a
|
am a5251bbc: (-s ours) am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit 'a5251bbcffc5e740c278b8d600481e705a1e9277':
|
2015-08-27 11:31:30 +00:00 |
|
Tim Kilbourn
|
c2d6851ac5
|
am ad1aa525: (-s ours) am 49983b99: Show correct text for app link domains.
* commit 'ad1aa5252fcef6ec6537f0fa9da3e84818a78512':
|
2015-08-27 11:31:28 +00:00 |
|
Jorim Jaggi
|
8107a3b1e2
|
am 221e0f44: (-s ours) am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '221e0f4400e25ee40bf3428c89b8de5a9415ba9a':
|
2015-08-27 11:31:27 +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 |
|