Kenny Guy
|
c8f366e843
|
am e200c475: (-s ours) am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit 'e200c4759f0f3d4fdfae5b965248050feaabe5ef':
|
2015-08-27 11:32:55 +00:00 |
|
Sanket Padawe
|
0d3accb711
|
am bee718b7: (-s ours) am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit 'bee718b7b1a9d675f3f652c2691f42a74ae0d559':
|
2015-08-27 11:32:50 +00:00 |
|
Maurice Lam
|
9541f8c35e
|
am d4fa7aa4: (-s ours) am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit 'd4fa7aa48c692fab0fc277021d5054650e0867eb':
|
2015-08-27 11:32:46 +00:00 |
|
Jason Monk
|
c4865d16e9
|
am 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '94b7585895751cd4db313ffa708fdff01f34b0d9':
|
2015-08-27 11:32:42 +00:00 |
|
Jason Monk
|
31cb2f6c01
|
am 5fa374cc: (-s ours) am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '5fa374cc20f4e0afc9da5644faf9ead86e7c4e57':
|
2015-08-27 11:32:39 +00:00 |
|
Maurice Lam
|
05faf8408a
|
am 58a6af14: (-s ours) am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '58a6af1496e457a799ff1b43b6426fb2812a22ce':
|
2015-08-27 11:32:29 +00:00 |
|
Jim Miller
|
c7c1dbc638
|
am 2a414b93: (-s ours) am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '2a414b9368fcc06bf7c849f8fb982038feaf6e5e':
|
2015-08-27 11:32:25 +00:00 |
|
Maurice Lam
|
11eb2c1caf
|
am d7be0656: (-s ours) am f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
* commit 'd7be0656ff51e20585916af19680a2c55ce03470':
|
2015-08-27 11:32:22 +00:00 |
|
Jason Monk
|
91de89d3b7
|
am 4a381902: (-s ours) am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '4a3819027a51681ed416177a3ecd0d1b22cfc82a':
|
2015-08-27 11:32:18 +00:00 |
|
Geoff Mendal
|
054e904ad1
|
am e1875783: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE
* commit 'e18757830920dcce30c78942582a0702a75806d0':
|
2015-08-27 11:32:15 +00:00 |
|
Narayan Kamath
|
38de1548c9
|
am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."
* commit '45e1e1ec928b236db0194b304361735fd93161ef':
|
2015-08-27 11:32:13 +00:00 |
|
xinhe
|
8b126014ac
|
am e9c822b0: (-s ours) am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit 'e9c822b0c6f29d920eeed4c19c90e202c68a70b5':
|
2015-08-27 11:32:11 +00:00 |
|
Jim Miller
|
dada503b70
|
am 52374856: (-s ours) am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
* commit '52374856e8d53f38ed1f313591598275316e4376':
|
2015-08-27 11:32:09 +00:00 |
|
Jason Monk
|
5fc2b6b9a8
|
am 81044820: (-s ours) am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev
* commit '810448204fd3fa4fd305fd40ee89da81cbd57d0f':
|
2015-08-27 11:32:06 +00:00 |
|
Billy Lau
|
b9f816874a
|
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 '45b27c3a04b997362d0884d2e52aa54d8fff1319':
|
2015-08-27 11:32:04 +00:00 |
|
Jorim Jaggi
|
25e493239e
|
am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev
* commit '8f37d4bc11841a3084a31471756b7d61d433c2eb':
|
2015-08-27 11:32:02 +00:00 |
|
Jason Monk
|
b0c6d9f0a3
|
am 31e05386: (-s ours) am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev
* commit '31e0538651f07e6fea67bf3dc3605b227ed26dea':
|
2015-08-27 11:32:01 +00:00 |
|
Martijn Coenen
|
bb9cb3bb08
|
am 90d21f09: (-s ours) am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev
* commit '90d21f096783e5d8fd3c44a0e69dd375bf301bd1':
|
2015-08-27 11:31:59 +00:00 |
|
Jason Monk
|
b9b4ea9383
|
am 34e7b4cd: (-s ours) am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '34e7b4cd0578527e9f86affb66048ea43870bdcb':
|
2015-08-27 11:31:58 +00:00 |
|
Sanket Padawe
|
14cb5c9ee2
|
am c319bac5: (-s ours) am 7995ca41: Use same technology type for LTE/4G
* commit 'c319bac558a7dae2e8df60a8ebc117d8bd712621':
|
2015-08-27 11:31:56 +00:00 |
|
Chris Wren
|
1271a4abdd
|
am ae15849d: (-s ours) am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev
* commit 'ae15849d114f6f0e24acb8acf5f7528aeb4d852a':
|
2015-08-27 11:31:55 +00:00 |
|
Geoff Mendal
|
226b8d30d0
|
am 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '329cea489bee113ff6534ba8cd0f981052d22bc8':
|
2015-08-27 11:31:53 +00:00 |
|
Zoltan Szatmary-Ban
|
fde014516f
|
am 30a73372: (-s ours) am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit '30a73372c4498b671b728e29ff1b7391e58057c5':
|
2015-08-27 11:31:52 +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 |
|
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 |
|