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
|
1bc1ba7591
|
am 61c436d7: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '61c436d73c76603d4ccec302984a137ab251c83a':
|
2015-08-27 11:33:56 +00:00 |
|
Svetoslav Ganov
|
a431dacb60
|
am 6356ee4b: (-s ours) am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '6356ee4bcb7b1fc12337f4f08c6635ffe42668a4':
|
2015-08-27 11:33:54 +00:00 |
|
Jason Monk
|
3e63b62e80
|
am 06621a57: (-s ours) am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '06621a57fd7894ba4835a157616b8b93215da7a7':
|
2015-08-27 11:33:53 +00:00 |
|
Jason Monk
|
4e3a98ccf1
|
am 5b3921e4: (-s ours) am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '5b3921e44ac8e83d6c72f7704395467f7c6558bc':
|
2015-08-27 11:33:52 +00:00 |
|
Guang Zhu
|
65fc6ae97b
|
am 8a4dda67: (-s ours) am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '8a4dda678668c211f512122fa2617fdafb8a2fcb':
|
2015-08-27 11:33:50 +00:00 |
|
Pavel Zhamaitsiak
|
f07fb80544
|
am 8a222530: (-s ours) am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '8a222530bec3d55c4512fe941a87f653dba8ca23':
|
2015-08-27 11:33:49 +00:00 |
|
Jason Monk
|
03dcebb641
|
am e2840f1c: (-s ours) am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit 'e2840f1ce34b4d085fc9eb8bcd2fde7dca3587e0':
|
2015-08-27 11:33:48 +00:00 |
|
Maurice Lam
|
00c4204d1d
|
am 2f2779ac: (-s ours) am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '2f2779acced14bfb2bf6ea4cecc74845a92ce384':
|
2015-08-27 11:33:46 +00:00 |
|
Maurice Lam
|
96235b3345
|
am 9dd92338: (-s ours) am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '9dd92338d05f3727e6b2b758ae319f20b08d5e7f':
|
2015-08-27 11:33:45 +00:00 |
|
Maurice Lam
|
3d09fef6f3
|
am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '899d0a28943ad7a797c6b8bf6bd1695cc6694f84':
|
2015-08-27 11:33:43 +00:00 |
|
Billy Lau
|
bc23f8e87f
|
am 3d861fd1: (-s ours) am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '3d861fd129913305196f4b4587211508343e626d':
|
2015-08-27 11:33:42 +00:00 |
|
Amit Mahajan
|
eb22a7e5e8
|
am c1d2289b: (-s ours) am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'c1d2289bc627cd9b2103ee66e5251b9fa0676022':
|
2015-08-27 11:33:40 +00:00 |
|
Julia Reynolds
|
6f90c1e52c
|
am cb271219: (-s ours) am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'cb271219c386a9a5280cfad63fa973631b552074':
|
2015-08-27 11:33:39 +00:00 |
|
Maurice Lam
|
be12776533
|
am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'c97e5aba84835ef126bee9cd4c288b4edb5d97fa':
|
2015-08-27 11:33:38 +00:00 |
|
Maurice Lam
|
63cccf0ee9
|
am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'a33b68af3e6fac653eb0102fbba3f38d0ba00f07':
|
2015-08-27 11:33:36 +00:00 |
|
Maurice Lam
|
34b0d29c72
|
am ac4b7fac: (-s ours) am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'ac4b7fac6b5778f715adf2d71dd92e4408b625a0':
|
2015-08-27 11:33:35 +00:00 |
|
Jim Miller
|
ad9671633a
|
am d55152af: (-s ours) am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'd55152afcef90dfe1e0a9c0cd475ecf3e9f4117c':
|
2015-08-27 11:33:32 +00:00 |
|
Geoff Mendal
|
817e60422a
|
am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit 'bc8c7914287b365a5cbd76b0e28f290cea4da8a6':
|
2015-08-27 11:33:30 +00:00 |
|
Makoto Onuki
|
eeb5456401
|
am 9e95d6ce: (-s ours) am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '9e95d6ce9fa49a7a4b748957d71d269f6f0e947e':
|
2015-08-27 11:33:27 +00:00 |
|
Jason Monk
|
fab32abd36
|
am cb4b45cc: (-s ours) am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit 'cb4b45cc30f969da52c7aa4c8b9d98240733d245':
|
2015-08-27 11:33:24 +00:00 |
|
Christopher Tate
|
6e9ace6a5a
|
am 55073e09: (-s ours) am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '55073e0954aad3378a1754bd08d2f9108b4bd902':
|
2015-08-27 11:33:21 +00:00 |
|
Jim Miller
|
2c8ee8e6e6
|
am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '7120c7b6e65557a05b46c7c915aee1a2390fd610':
|
2015-08-27 11:33:18 +00:00 |
|
Julia Reynolds
|
186116163e
|
am 75b901c3: (-s ours) am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '75b901c336360bd6f81247305c41361fdfef2b6b':
|
2015-08-27 11:33:15 +00:00 |
|
Billy Lau
|
e058a53fd2
|
am 262b64e7: (-s ours) am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '262b64e7a994fd07fa5891648908ef98de42ab61':
|
2015-08-27 11:33:04 +00:00 |
|