Pavel Zhamaitsiak
|
38deb84ea4
|
am f07fb805: am 8a222530: (-s ours) am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit 'f07fb8054457aa7a3d410e63fb8435044a7aa757':
|
2015-08-27 20:18:14 +00:00 |
|
Jason Monk
|
6dabdb217b
|
am 03dcebb6: am e2840f1c: (-s ours) am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '03dcebb641083d8e02d0019acee9bebd0678a2ea':
|
2015-08-27 20:18:11 +00:00 |
|
Maurice Lam
|
e7e43ec8e7
|
am 00c4204d: am 2f2779ac: (-s ours) am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '00c4204d1d7d7982c93041b14abe407540d9c699':
|
2015-08-27 20:18:09 +00:00 |
|
Maurice Lam
|
eea9cf174b
|
am 96235b33: am 9dd92338: (-s ours) am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '96235b3345c47b853108dca5a1f7841ee0060d57':
|
2015-08-27 20:18:06 +00:00 |
|
Maurice Lam
|
dc661005de
|
am 3d09fef6: am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '3d09fef6f3484d90803af5ad60b586a9d13dccf0':
|
2015-08-27 20:18:04 +00:00 |
|
Billy Lau
|
8ac1851211
|
am bc23f8e8: am 3d861fd1: (-s ours) am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'bc23f8e87fc8b698cfdd20ef17fafa17f674e4a8':
|
2015-08-27 20:18:01 +00:00 |
|
Amit Mahajan
|
3deead6ec7
|
am eb22a7e5: am c1d2289b: (-s ours) am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'eb22a7e5e801c697836136c6ba1b8568a2afa8aa':
|
2015-08-27 20:17:59 +00:00 |
|
Julia Reynolds
|
1c429294f1
|
am 6f90c1e5: am cb271219: (-s ours) am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '6f90c1e52c5b996566391ee387fc582b9c115f9b':
|
2015-08-27 20:17:56 +00:00 |
|
Maurice Lam
|
1e21579d49
|
am be127765: am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'be1277653320931d3c30f266a805e0b7bad8d53a':
|
2015-08-27 20:17:53 +00:00 |
|
Maurice Lam
|
15662c0c41
|
am 63cccf0e: am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '63cccf0ee900cef3c8046cbc1002e29977d370d8':
|
2015-08-27 20:17:50 +00:00 |
|
Maurice Lam
|
fc7c549da3
|
am 34b0d29c: am ac4b7fac: (-s ours) am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '34b0d29c728d966a51fa173d1e16ccda5465f44b':
|
2015-08-27 20:17:48 +00:00 |
|
Jim Miller
|
f9088fe8f5
|
am ad967163: am d55152af: (-s ours) am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'ad9671633a5e23a85405056786967130cb4942e6':
|
2015-08-27 20:17:44 +00:00 |
|
Geoff Mendal
|
e655c0b942
|
am 817e6042: (-s ours) am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '817e60422ae3c1fe9f2ba4cea0252d2975711ba5':
|
2015-08-27 20:17:41 +00:00 |
|
Makoto Onuki
|
72741d4371
|
am eeb54564: am 9e95d6ce: (-s ours) am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit 'eeb54564015b6bfe20adb06e04b5b8382fd10cc5':
|
2015-08-27 20:17:38 +00:00 |
|
Jason Monk
|
771bcdeaf5
|
am fab32abd: am cb4b45cc: (-s ours) am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit 'fab32abd36833c30c3af4277c49340b9d728f725':
|
2015-08-27 20:17:35 +00:00 |
|
Christopher Tate
|
f9aefc63ac
|
am 6e9ace6a: am 55073e09: (-s ours) am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '6e9ace6a5aa0d03dd1629a1069a3e14a2ddef7bc':
|
2015-08-27 20:17:33 +00:00 |
|
Jim Miller
|
837623cdc1
|
am 2c8ee8e6: am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '2c8ee8e6e68fca38188379126cbb40c1aa8d5185':
|
2015-08-27 20:17:30 +00:00 |
|
Julia Reynolds
|
381947706e
|
am 18611616: am 75b901c3: (-s ours) am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '186116163ee8b6ed2197cfd0f6e734957da89046':
|
2015-08-27 20:17:28 +00:00 |
|
Billy Lau
|
6fdec7a4ff
|
am e058a53f: am 262b64e7: (-s ours) am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit 'e058a53fd2367f080b52fe56c80af3267ce4781b':
|
2015-08-27 20:17:25 +00:00 |
|
Christopher Tate
|
aebf5096cd
|
am 0cc7388b: am feb343ad: (-s ours) am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '0cc7388b20bd31fb4f63479c1d505807adf42833':
|
2015-08-27 20:17:22 +00:00 |
|
Kenny Guy
|
5efd226ac9
|
am c8f366e8: am e200c475: (-s ours) am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit 'c8f366e843dba00465f2863fa3de42a986d65704':
|
2015-08-27 20:17:19 +00:00 |
|
Sanket Padawe
|
44a0350884
|
am 0d3accb7: am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '0d3accb711bbfd8c31f9bbc228b0b3441fbd39ff':
|
2015-08-27 20:17:17 +00:00 |
|
Maurice Lam
|
4c89fdfd42
|
am 9541f8c3: am d4fa7aa4: (-s ours) am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '9541f8c35e01360d29be2e7095e03d60ae116b92':
|
2015-08-27 20:17:14 +00:00 |
|
Jason Monk
|
4912afd03d
|
am c4865d16: am 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit 'c4865d16e9e0b55df2a071f0f106f82ce012ce31':
|
2015-08-27 20:17:12 +00:00 |
|
Jason Monk
|
b756c83645
|
am 31cb2f6c: am 5fa374cc: (-s ours) am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '31cb2f6c01cd414463c2a1c0ca0d28d78af86e0d':
|
2015-08-27 20:17:09 +00:00 |
|
Maurice Lam
|
72a3186f51
|
am 05faf840: am 58a6af14: (-s ours) am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '05faf8408a79f019d2ce7aa01f90f1dcf07f0fc5':
|
2015-08-27 20:17:06 +00:00 |
|
Jim Miller
|
48ce6611b0
|
am c7c1dbc6: am 2a414b93: (-s ours) am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit 'c7c1dbc6388bcb921b3404b8f664eac90df91c29':
|
2015-08-27 20:17:03 +00:00 |
|
Maurice Lam
|
460e2ed68d
|
am 11eb2c1c: am d7be0656: (-s ours) am f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
* commit '11eb2c1caf012564569139148f5cb008b8118a39':
|
2015-08-27 20:17:01 +00:00 |
|
Jason Monk
|
3e0289485d
|
am 91de89d3: am 4a381902: (-s ours) am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '91de89d3b72562884779a3488b36fe00951132c4':
|
2015-08-27 20:16:58 +00:00 |
|
Geoff Mendal
|
bd2e6d95a2
|
am 054e904a: (-s ours) am e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '054e904ad1b0260bad91d656ad28fff11c96980f':
|
2015-08-27 20:16:56 +00:00 |
|
Narayan Kamath
|
2e138d1ae7
|
am 38de1548: am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."
* commit '38de1548c9c43a9777bcfd50cc552753f98aa87c':
|
2015-08-27 20:16:53 +00:00 |
|
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 |
|