xinhe
|
16b538d5b3
|
am 8b126014: am e9c822b0: (-s ours) am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '8b126014ac7e0eefd9e7f62dfd1ac0528772e23e':
|
2015-08-27 20:16:51 +00:00 |
|
Jim Miller
|
619f3d89e0
|
am dada503b: am 52374856: (-s ours) am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit 'dada503b703ea3f921f199f51715b285643d8b8e':
|
2015-08-27 20:16:48 +00:00 |
|
Jason Monk
|
0f08913441
|
am 5fc2b6b9: am 81044820: (-s ours) am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '5fc2b6b9a88c3099ebdb139a89c1ca812ddd4a5f':
|
2015-08-27 20:16:46 +00:00 |
|
Billy Lau
|
18c3497c6f
|
am b9f81687: am 45b27c3a: (-s ours) am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
* commit 'b9f816874a1b2e4a55d82e0129ebd273c620c6f9':
|
2015-08-27 20:16:43 +00:00 |
|
Jorim Jaggi
|
c7f4fe2440
|
am 25e49323: am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '25e493239ea5b1dec98df8f987695a7fa299df79':
|
2015-08-27 20:16:41 +00:00 |
|
Jason Monk
|
04f0fb2782
|
am b0c6d9f0: am 31e05386: (-s ours) am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit 'b0c6d9f0a3c27c8975eda3270187970dc602b537':
|
2015-08-27 20:16:38 +00:00 |
|
Martijn Coenen
|
ded9e8394a
|
am bb9cb3bb: am 90d21f09: (-s ours) am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit 'bb9cb3bb087c24d897f21a179a78f5e9b838e08e':
|
2015-08-27 20:16:35 +00:00 |
|
Jason Monk
|
ded32f10d9
|
am b9b4ea93: am 34e7b4cd: (-s ours) am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit 'b9b4ea9383b856aa9700d47aabcfddf1534db81e':
|
2015-08-27 20:16:32 +00:00 |
|
Sanket Padawe
|
2ef9d7eed7
|
am 14cb5c9e: am c319bac5: (-s ours) am 7995ca41: Use same technology type for LTE/4G
* commit '14cb5c9ee2d999aa4f07a555e64768678ab073b7':
|
2015-08-27 20:16:30 +00:00 |
|
Chris Wren
|
91efd6544c
|
am 1271a4ab: am ae15849d: (-s ours) am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit '1271a4abdde9b120a653f0e9006098f71fbd2a61':
|
2015-08-27 20:16:27 +00:00 |
|
Geoff Mendal
|
18c4ff3ded
|
am 226b8d30: (-s ours) am 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '226b8d30d09a2626fc379ff0c7411786a191b4ed':
|
2015-08-27 20:16:24 +00:00 |
|
Zoltan Szatmary-Ban
|
dae4693d99
|
am fde01451: am 30a73372: (-s ours) am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit 'fde014516f884e957a1fdcd0a4c8d8ff71c0f47c':
|
2015-08-27 20:16:20 +00:00 |
|
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 |
|
Jorim Jaggi
|
4fdd5cc6e0
|
am a77130f7: (-s ours) am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit 'a77130f7e40bb5cb16b2379d0739f85402906d18':
|
2015-08-27 11:34:13 +00:00 |
|
Jorim Jaggi
|
3ae8ae371f
|
am 69941efa: (-s ours) am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '69941efa8bf2a41c03293aa6986fbe6d873baa2d':
|
2015-08-27 11:34:12 +00:00 |
|
Jorim Jaggi
|
2531fe7c45
|
am e4e8bb34: (-s ours) am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'e4e8bb3486bd3642baa88a06c529cb428c27005f':
|
2015-08-27 11:34:11 +00:00 |
|
Selim Cinek
|
da7bbe6810
|
am d2b6e1ac: (-s ours) am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit 'd2b6e1acd0ca0ebd3cfc64295dc19ef2cf1c4455':
|
2015-08-27 11:34:10 +00:00 |
|
Selim Cinek
|
5aae3caea2
|
am 412eb5df: (-s ours) am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '412eb5dfdea71902ac64a1392cf9d791b0a5f647':
|
2015-08-27 11:34:08 +00:00 |
|
Selim Cinek
|
73de309dc9
|
am e0f552c1: (-s ours) am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit 'e0f552c140c98ad20d97dd139606a4fbf8451982':
|
2015-08-27 11:34:07 +00:00 |
|
Jorim Jaggi
|
ff53e1415a
|
am 607e7963: (-s ours) am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '607e796331ce7c32b989d02efb9e303fc2c71bef':
|
2015-08-27 11:34:06 +00:00 |
|
Jason Monk
|
5c87cdd8a7
|
am 9a5dc80d: (-s ours) am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '9a5dc80d050fb63fa5f2c8b5877b4b9ecc3123a8':
|
2015-08-27 11:34:04 +00:00 |
|
Jason Monk
|
c3c9dbd31e
|
am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '9d5907d03edfec6a2823f908cade6c458644da0b':
|
2015-08-27 11:34:03 +00:00 |
|
Sanket Padawe
|
759e3fab0b
|
am 9cbb3549: (-s ours) am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '9cbb3549369b412525dc6485c6b6eba189208e76':
|
2015-08-27 11:34:02 +00:00 |
|