Adrian Roos
|
c667011fad
|
am d6dc0bb4: (-s ours) am 38c9b9eb: Update FRP warning to spec
* commit 'd6dc0bb46af5ceb0253577716e5a09ddc0145044':
|
2015-08-27 11:33:58 +00:00 |
|
Maurice Lam
|
d04a354f3e
|
am 27165dc3: (-s ours) am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit '27165dc3e86642b862b9333d82742be5924c72b3':
|
2015-08-27 11:33:57 +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 |
|
Christopher Tate
|
0cc7388b20
|
am feb343ad: (-s ours) am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit 'feb343ad74ad4fe5e9b762da99e73682500f9b1a':
|
2015-08-27 11:32:59 +00:00 |
|
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 |
|