android-6.0.0_r26-to-android-6.0.1_r3.txt

project art/
7f57e8c [WIP] ART: Write-protect TLS
54d8f4b Fix in reference type propagation
ddb2a98 Parse runtime compiler options for JIT
f015c2f ART: Add missing GetInterfaceMethodIfProxy
2602aa8 ART: Decrease dex2oat watchdog timeout
22e0ce3 DO NOT MERGE Add locking to prevent races between setting class methods and marking
2a19678 ART: Do not abort on exception in CreatePeer
cc07760 ART: Clean up less in dex2oat
4833277 ART: Change UninitializedThis tracking in the verifier
603b4c2 Fix some java_lang_Class related moving GC bugs
c1956de Fix compaction bug in Class_getDeclaredMethodsUnchecked
d6ec651 ART: Sometimes even empty methods take forever to verify
c2d3221 Quick: Abolish kMirOpCheckPart2.
85336e3 Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
38f2085 Update the remaining input index of phis after deleting an input.
3a01631 ART: Fix loop information after dead code elimination
06cb4a9 Fix constructor access check through reflection

project bionic/
055a66c Sync with upstream NetBSD lib/libc/regex.
beb6e08 Sync with upstream NetBSD lib/libc/regex.
9a9572d Sync with upstream NetBSD lib/libc/regex.
cf92738 Ensure that readlink has access to /proc/self/fd
cd92787 Update timezone data to 2015g
f32b689 Log dlopen failures caused by text relocations
a828a2f linker: don't pass dlextinfo to dependent loads.
c3351ea Work around incorrect dt_needed entries
4cb434d Fix regression in crash reporting

project bootable/recovery/
ec63d56 Track usage of Vector / SortedVector from libutils DO NOT MERGE
a200639 uncrypt: Support file level encryption.
babcffa Revert "Change init sequence to support file level encryption"
0460f69 Revert "Zero blocks before BLKDISCARD"

project build/
610455d "MMB29M"
f9afd24 Revert "Change version back to 6.0"
5263cbe "MMB29L"
775b937 Change version back to 6.0
8de7eff "MMB29K"
81631fc "MMB29J"
2916f13 "MMB29I"
df4c0b8 "MMB29H"
e91c62b "MMB29G"
beb95a6 "MMB29F"
60e7872 "MMB29E"
2225e21 "MMB29D"
4dac0d1 "MMB29C"
2281de2 "MMB29B"
ca8fc4c "MMB29"
1917216 bump version to MMB28B
0e4651c "MMB28"
953e3ab "MMB27"
dc63d3f "MMB26"
eaa9ee3 "MMB23"
91ad6c3 "MMB22C"
7463369 "MMB22B"
19eec07 Update security string to 2015-12-01
6575d4a Update security string to 2015-12-01 - DO NOT MERGE
0a20c94 Bump Android to 6.0.1
d0d3d96 "MMB22"
7545092 "MMB21B"
b37ad16 "MMB21"
e6d275d "MMB20"
0f1512b Update security string to 2015-12-01
358c890 "MDB08M"
09de252 "MMB19"
7404fae "MMB18"
e09359a DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
3203bc1 DO NOT MERGE releasetools: Always write the last block if it's padded.
aedf17e "MDB08L"
5f51f7d Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
77bf289 "MDB08K"
f63a6a8 Reverting Android Security Patch Level string back to 2015-10-01
40f9cf0 "MMB15"
64c362a "MDB08J"
f047da6 Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
4a343e7 "MDB08I"
acbb68f "MMB14"
57a64e0 Add all-named-(dirs|files)-under and related
7a74e5e Add all-cpp-files-under
76a89d3 Sort all files found via $(shell find)
79fdbdb "MDB08H"
046063a "MMB13"
ab4d859 Switch from Calculator to ExactCalculator
8d97745 "MDB08G"
338da60 DO NOT MERGE: Only use a fixed timestamp when packaging.
541871c "MMB12"
b8b2859 "MDB08F"
413ade1 "MMB11"
3d59345 add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
263391b "MDB08E"
342e997 "MDB08D"
65bc19a "MDB08C"
65ea81c "MMB08B"
419d8f9 "MDB08B"
f736feb "MDB08"
c2f0094 "MMB08"
514b6a1 "MDB07C"
4c9e573 "MDB07B"
ad7e070 "MMB07B"
827893b MMB07
faded1a "MDB07"
28888ac "MDB06B"
144973e "MDB06"
a80f38e "MDB05D"
4bcc830 "MDB05C"
68a2ce7 "MDB05B"
9ebc129 "MDB05"
7e00be4 "MDB04"
13a4742 "MDB02B"
6a59a6d "MDB02"
7702172 Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
e31bc53 MDA89G
73e9a30 "MDB02"
90d37b4 "MDA89F"
b4f1f85 "MDA89E"
cf52ef0 "MDA89D"
0716141 "MDA89C"
95cf8e2 "MDA89B"
69f7325 "MDA89"
0946808 "MDA87D"
5093050 "MDA87C"
f55bd72 "MDA87B"
a6a25bb "MDA87"
8827d52 "MDA86B"
3b7a643 "MDA86"
b5bc145 "MDA85C"
7309606 "MDA85B"
47dfcc7 "MDA85"
f954d47 "MDA84C"
d79c193 "MDA84B"
829a91e "MDA84"
6bbf105 "MDA83C"
45da815 "MDA83B"
b79e877 Don't add build number to apps' version name for platform build.
a497a0e "MDA83"
b5be5ef "MDA82B"
1cf078e "MDA82"
8f31686 "MDA79I"
264e992 "MDA79H"
0482ae4 "MDA79G"
6b29e6e "MDA79F"
631178b "MDA79E"
d950f05 "MDA79D"
a4a7b17 "MDA79C"
798c410 "MDA79B"
77f3a66 "MDA79"
a949c44 MDA78E
9187c58 "MDA78D"
a0586c0 "MDA78C"
cb78a08 "MDA78B"
b0de3f0 "MDA78"
5e0d8ae "MDA77E"
edbe6c4 "MDA77D"
b63fa8b "MDA77C"
67850d4 "MDA77B"
bf57d11 "MDA77"
95d7674 "MDA76"
9a82157 "MDA75"
37c30bd "MDA72I"
b19648d "MDA72H"
e0bf570 "MDA72G"
874c791 "MDA72F"
cfbd887 "MDA72E"
8a3d4c2 "MDA72D"
1333093 "MDA72C"
6c512f2 "MDA72B"
25ceb60 "MDA72"
7c455ea "MDA71C"
cb6dfdf MDA71B
28c7416 "MDA71"
8fc0db1 "MDA70C"
d22e02e "MDA70B"
a2d210d "MDA70"
6ea86eb "MDA69"
10c3718 "MDA68"
ec86410 "MDA65H"
1119fbc "MDA65G"
5325444 "MDA65F"
85b8cd8 "MDA65E"
4054fd5 "MDA65D"
a2fea0f "MDA65C"
cf848fb "MDA65B"
526ebfa "MDA65"
b551d04 "MDA64B"
90c79de "MDA64"
c93fdba "MDA63B"
2258217 "MDA63"
4f0fbce "MDA62C"
ad70c94 "MDA62B"
64a9217 "MDA62"
b39be90 "MDA58F"
a262ca2 "MDA60B"
966d7d9 "MDA60"
a4687d2 "MDA58E"
9f34d5d "MDA58D"
7792dbe "MDA58C"
7be3665 "MDA58B"
76455f3 "MDA58"
50c1db4 "MDA57"
9a31ed8 "MDA56B"
c4f9cda "MDA56"
3fc7c6f "MDA55"
1c2d61e "MDA54"
d4829a0 "MDA53"
198d8e2 "MDA51F"
f13567e "MDA51E"
16fb35a "MDA51D"
ac062c5 "MDA51C"
b69c2ad "MDA51B"
b2c0cee "MDA51"
afaeb05 "MDA50B"
cc8166e "MDA50"
4f4a527 "MDA49B"
afb1459 "MDA49"
d5d3883 "MDA48"
e7a2d16 "MDA47"
530621e "MDA46"
0c50544 "MDA44G"
2ab6353 "MDA44F"
c825325 "MDA44E"
2a94504 "MDA44D"
72e6a83 "MDA44C"
08d325c "MDA44B"
199d884 "MDA44"
3458f53 "MDA43B"
108995e "MDA43"
c97fb60 "MDA42D"
e198406 "MDA42C"
90b520d "MDA42B"
fb3971e "MDA42"
9613650 MDA41B
7335d3d "MDA41"
913aa24 "MDA40"
a1e4f75 "MDA39"
5ee7262 "MDA37F"
f7686e3 "MDA37E"
0c31682 "MDA37D"
6ec1bac "MDA37C"
0b49ebd "MDA37B"
4b7c822 "MDA37"
56b80ad "MDA36B"
1aeda1b "MDA36"
eabed94 "MDA35C"
42cf27a "MDA35B"
cfe07c8 "MDA35"
d03438e "MDA34B"
e6c132e "MDA34"
a7ce9c7 "MDA33"
5cae4b8 "MDA32"
1adc41a "MDA30H"
f3733ec "MDA30G"
f0a1ead "MDA30F"
01299fb "MDA30E"
bbf576e "MDA30D"
cd39d0a "MDA30C"
5c9c835 "MDA30B"
f9b2641 "MDA30"
02e2a37 "MDA29B"
4b07dd5 "MDA29"
7f82594 "MDA28"
eb3a5ae "MDA27"
e603103 "MDA26"
3bda5c5 "MDA25"
46306bc "MDA23D"
b89bbae "MDA23C"
3e43ec9 MDA23B
ab38294 "MDA23"
abf6cfe "MDA22C"
f89e0a8 "MDA22B"
1791651 "MDA22"
18fd222 "MDA21B"
5c92042 "MDA21"
e1a09af "MDA20"
aaa5256 "MDA19"
1f346be "MDA18"
71ddc57 MDA16G
e451a9e "MDA16F"
c4cd917 "MDA16E"
f3cc78b "MDA16D"
95b0eee "MDA16C"
1077ab8 "MDA16B"
033aa93 "MDA16"
669baee "MDA15B"
9edd74f "MDA15"
983cbd1 "MDA14D"
86a0166 "MDA14C"
5c22d20 "MDA14B"
702f512 "MDA14"
36bd774 "MDA13B"
26a1a9d "MDA13"
2763c27 "MDA12"
ca8de3b "MDA11"
208e0bf "MDA09B"
62cdce0 "MDA09"
3864c71 "MDA08C"
bcd142f "MDA08B"
6cf7874 "MDA08"
1bff2e9 "MDA07C"
ab5e6f6 "MDA07B"
db14e56 "MDA07"
a211649 "MDA06B"
7862b64 "MDA06"
fbff09e "MRZ79H"
8c4da68 "MRZ79G"
bc61733 "MRZ79F"
ab451fd "MRZ79E"
8e03535 "MRZ79D"
45fa5f4 "MRZ79C"
5a93c1c "MRZ79B"
abf1aa8 "MRZ79"
8e03097 "MRZ78B"
e6e9856 "MRZ78"
1c90241 "MRZ77B"
71ca134 "MRZ77"
770f2dd "MRZ72F"
7897047 "MRZ76B"
4c839ad "MRZ76"
abe0c11 "MRZ75"
ce5bc95 "MRZ74"
0a6e8fa "MRZ72E"
2b7ba64 "MRZ72D"
85ee69a "MRZ72C"
ef58ef0 "MRZ72B"
e3eb037 "MRZ72"
1566ad3 "MRZ71C"
230223f "MRZ71B"
f33d9a7 "MRZ71"
7edba94 "MRZ70C"
b9284b1 "MRZ70B"
29543aa "MRZ70"
988f415 "MRZ69B"
e588d89 "MRZ69"
d0453c5 "MRZ68"
8ce8ab7 "MRZ67"
c255469 "MRZ65F"
3b440a9 "MRZ65E"
4aa93a7 "MRZ65D"
42008e2 "MRZ65C"
07417cc "MRZ65B"
49cbee2 "MRZ65"
74a75cd "MRZ64B"
aa319df goldfish: logcat -Q in logd domain
234360e "MRZ64"
0e395b1 "MRZ63C"
1782365 "MRZ63B"
ad6b53c "MRZ63"
026fb45 "MRZ62B"
cd8c93a "MRZ62"
9fd7b46 "MRZ61"
5159f81 "MRZ60"
79a9f03 "MRZ58D"
694eae2 "MRZ58C"
a024274 "MRZ58B"
17e09d9 "MRZ58"
7254999 "MRZ57B"
b2c49b7 "MRZ57"
706180c "MRZ56B"
b7f627a "MRZ56"
b8a9fac "MRZ55"
c61fbc4 "MRZ54"
41803ee "MRZ53"
06828a5 "MRZ51G"
41b24a5 "MRZ51F"
f0a8b85 "MRZ51E"
c0e833d "MRZ51D"
d8308d4 "MRZ51C"
0fa5417 "MRZ51B"
4e786a0 "MRZ51"
337a063 "MRZ50C"
5b2a679 "MRZ50B"
6e8931c "MRZ50"
400563e "MRZ49C"
949d358 "MRZ49B"
83f4501 "MRZ49"
fabc869 "MRZ48B"
0a0358c "MRZ48"
f2cdd5c "MRZ47"
41814f4 "MRZ46"
bbc1fb6 "MRZ44F"
185d864 "MRZ44E"
7d0e8a5 "MRZ44D"
a5de1e5 "MRZ44C"
9894e2c "MRZ44B"
5fa080b "MRZ44"
52e9404 "MRZ43B"
3e8f161 Remove libc++ from prepackaged shared libs in cts.
3bc0bc5 Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
74b2788 "MRZ43"
e1bf3dd "MRZ42C"
c06ecd2 "MRZ42B"
9269975 "MRZ42"
cd30cbd "MRZ41B"
705e75b "MRZ41"
b599734 MRZ40B
02c2b6a "MRZ40"
53031ff "MRZ39"
44791bf "MRZ37F"
d15dbd7 "MRZ37E"
978c935 "MRZ37D"
aca3465 Revert "Switch from Calculator to ExactCalculator"
a879195 "MRZ37C"
b5dc52a "MRZ37B"
8b834ff "MRZ37"
2014678 "MRZ36B"
c4fc651 "MRZ36"
01864b7 "MRZ35B"
68cc486 "MRZ35"
0128279 "MRZ34C"
20e7715 "MRZ34B"
01f3dbc Revert "Don't extract jni from prebuilt apks."
8f049bd "MRZ34"
875982a "MRZ33"
708d1d1 "MRZ32"
9e2df49 "MRZ30D"
2d43098 "MRZ30C"
f771c7e "MRZ30B"
1a83636 "MRZ30"
fbd11a5 "MRZ29B"
c2309f5 "MRZ29"
13296f9 "MRZ28C"
740279f "MRZ28B"
0ab1fbd "MRZ28"
a37d793 "MRZ27B"
efc9f52 "MRZ27"
f9ecd3f "MRZ26"
8a96072 "MRZ25"
f7533d3 "MRZ24"
e447ac2 "MRZ23B"

project cts/
88c326c DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4
473c226 DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
658da1e Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
49175b0 DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase
60e3381 DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure
d476b03 Increase wait timeout for ContextWrapperTest
236f986 Change CTS verifier HifiUltrasound Tests text to be consistent with CDD text
c0f70ce CTS: DO tests for DISALLOW_CONFIG_VPN
73d9ee1 Fix CameraManagerTest logic.
3905dd3 cts: Skip encodeDecode tests when there is no needed encoder
d40ad32 Stop android.print tests from executing if the device does not support print.
90cbf47 DO NOT MERGE Add running time hints to CTS package config
6dcff9f CameraITS: use linear tonemap in test_exposure
c004f8f TIF: Make sure that Cursor.moveToNext() is called before using Cursor
16a9ec8 DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
ace696d Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
032fd6b DO NOT MERGE CTS version is now 6.0_r1.5
37b9b9b AudioRecordTest: Remove assert check on cold input start time
f7f7d59 Stop android.print tests from executing if the device does not support print.
761b466 Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY
35addd3 DO NOT MERGE: Disable two multi user tests for TV devices
6aab9db DO NOT MERGE Add running time hints to CTS package config
b8a45aa add get_achievable_rates.py under cts-media tools
ffc3697 Squashed commit of the following:
d301957 testReleaseAfterFlush: extend to audio encoders
a41d497 Squashed mnc-dev changes:
1a9e4e5 testDecodeAfterFlush: extend to audio
0fda173 security: Test mediaserver crash against an invalid MIDI file
793e295 CTS verifier issue "Screen Pinning Test will fail"
13c1585 MediaMetadataRetrieverTest: add new test to handle overflowed padding.
859f10d In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver.
db56817 CTS: Test for sound capture
7fe1f92 DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam
f55c3f6 Use requestNetwork with all transport types that hardware features report
8dc18fe Camera: allow FULLHD_ALT in jpeg sizes
2a920db Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
f08dc24 media: add mpeg4 qcif test to VideoDecoderPerfTest.
a7b5b95 Fix test incompatibilities with Nemo (watch) device.
384f95e Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH
2751d70 Change TextView break strategy to meet Android Wear configuration.
2440aa9 DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch
7118cd4 Camera2: fix video stabilization test
3691968 DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel
b69bdab DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel
e272993 Camera: fix wrong assertion logic
bc0d8c6 MotionEvents must check for invalid sample/pointer counts
83eea62 Ensure test notification is properly announced
ce4cf2e Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"
a604e38 [PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes
5e689a8 Allow number of supported Bitmap to be greater than 4.
b289b1f Check whether listening TCP ports are connectable.
ca23438 CTS verifier issue "Screen Pinning Test will fail"
95c7bda Fix SeedTest for landscape
8d329f3 Use correct context when querying package manager
53d2671 [devicepolicy] More complete test of CaCert API
953ab3a DO NOT MERGE Allow multiple deqp packages per API
4c42e8d In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver.
18f401e Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS
e2f380f Check for presence of video codec before testPlayHlsStreamWithTimedId3
4a6fa50 security: Test OOB arbitrary write at AMessage::FromParcel
6a8a18b Fix CTS 4.4 R4 testHoloTheme test failure.
accb996 Fix build
6b8eae4 Remove unnecessary layout request, avoid obtaining wrong bounds rect
bf1875a Add an option to use log saver for generated XML report
1b0bd2c [CtsVerfier] ScreenLockBoundKeys - use different key ID
9edd486 Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing
38a07ad CTS runner fixes
b6ab3b2 MIDI CTS: remove tests that pass null callback
861fc41 Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"
6ecbb88 Update CTS for unsupported legacy ConnectivityManager APIs
f049e59 Fix contacts provider cts tests
954eefe media: combine log to reduce the size
b999e79 Add MIDI feature to MNC section
d173212 Permissions: Fix Auth CTS tests to reflect changes.
53b27bd Verify uninstall using "pm list".
bdf0b8e testExtractAlpha was asserting a bug
a479b2c CTS: TelephonyProviderTest failing
40db3d8 media: use small frame size for resource manager test.
edd4ec4 Update last public framework attribute to pass CTS test.
03db252 Revert "add more logging to monkey seed test"
d32ddbf Add Ble test cases to BuildCtsTemporarilyKnownFailureList.
fcd0c82 Add logging statements to debug hangs.
6716917 media: deliver report to host
98a6bcd videoperf: specify timeout for VideoEncoderDecoderTest
8a0ebb8 use locked orientation instead of "nosensor"
5aafe29 MediaSyncTest: use float for playback rate tolerance to keep consistent with others.
e11e244 media: deliver test report to host.
e548f98 CTS: Adds conditions to bypass FileSystemPermissionTest.testDeviceTreeCpuCurrent
308abc6 videoperf: avoid potential ArrayIndexOutOfBounds
7cc7c32 Use example.com for strict mode cts test.
4b61d4c Remove not relevant browser tests - APIs are gone
71dba80 Remove android.security.cts.SeccompBpfTest.
71e5ed7 A better shadow value to cover more devices, handle TV theme override.
7dd1e17 Respect hard restriction to minimum password length in CTS
7bea994 Use simple break strategy for testSetTextLong
a99d048 Split CTS-DEQP plan into two plans
039b00b Fix up Looper preparation.
69c85ad Fix build
a01622e Dismiss dialogs during indeterminate progress dialog CTS tests
4eaca29 Use dup2() to make message queue tests less flaky.
22e6c1c Fix Drawable, PopupWindow CTS breakages
ac23f11 fix build
6da731e Remove WebGL conformance tests from CTS
b35b30c Temp disables for deqp tests failing due to missing driver fixes.
3762271 Ensure JobScheduler Connectivity CTS reenables WiFI
c145421 Temporarily disable flaky EGL tests while waiting for driver fixes
71f03b6 Failing android.content.ContentResolver tests to CTS staging
84d24c0 Add workaround for ContetxtImpl.setTheme(), verify test setup
c9bc142 Hide more failing CTS-DEQP tests.
76fc052 Hide failing GLES31 texture.border_clamp tests.
93ee255 Add STOPSHIP to CTS-DEQP plan generation.

project dalvik/
f8ed7d3 Fixes unnecessary multi-merge steps.

project development/
28bb8be Update the Connectivity debug app to the multinetwork API.
19923db Update build tools rev to <API>.0.2. DO NOT MERGE.
afe2d24 Fix llvm-rs-cc.exe crash for windows
c60faf6 Update system images to revision 4
61c57fd Setup flags to make SDK images provisioned.

project device/common/
762617a Add a path variation for dragon device

project device/sample/
afdacb6 Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf
136d262 Updating MTS Canada APN config (302-660)
d7a1fbf Fix APN configs for SoftBank JP (MCCMNC=44020) per their request. This issue was reported on Shamu with mnc-release, but we couldn't fix it before M OTA because of schedule issue.
8d46143 Change to add user_visible field to Carriers table.
c0b4a21 Change APNs as request of operators

project docs/source.android.com/
0fda4ae Docs: Change to the Fingerprint HAL doc
5819eee Docs: Android 6.0 CDD initial release
ffb1309 CDD: Changelog addition for app links requirement
903634a CDD: Update intent resolution requirements for app links
48289c6 Change keymaster and gatekeeper requirements to strong recommendations.
857d22c Add requirements for IPv6 implementation.
727f7d7 CDD: Update resource numbers in section 7-end. Update Resources list.
2c0bb6b CDD: Relax NfcV requirement from MUST to STRONGLY RECOMMENDED
7e1c3b1 CDD: Updates to changelog and misc. fixes
516abae CDD: Renumber Resources in the CDD
e97c923 CDD: Add new sections for power-saving modes and accounting
16032dc CDD: Clarify relationship of managed profile and multiple users
accc58c CDD: Clarify language around Assistant requirements
9ddf383 CDD: Update video decoding req. to support up to screen size
302ee7a CDD: require mDNS packet support on Wi-Fi even in low-power

project external/aac/
48b330d Remove __DATE__/__TIME__

project external/bouncycastle/
4f5a324 Register DSA OID for KeyFactory not just Signature

project external/chromium-webview/
f21e832 WebView AOSP Drop Request - 44.0.2403.114
818ef2f WebView AOSP Drop Request - 44.0.2403.90
ba40585 WebView AOSP Drop Request - 44.0.2403.85
915bc46 WebView AOSP Drop Request - 44.0.2403.64
297ac26 WebView AOSP Drop Request - 44.0.2403.54
8064614 WebView AOSP Drop Request - 44.0.2403.39
55d1035 Revert "Revert "WebView AOSP Drop Request - 44.0.2403.33""
4c9f37e Revert "WebView AOSP Drop Request - 44.0.2403.33"
ca301b8 WebView AOSP Drop Request - 44.0.2403.33
d17ce7e WebView AOSP Drop Request - 44.0.2403.13
eb73773 WebView AOSP Drop Request - 44.0.2403.13
7ca5c4d Update AOSP Webview Apks
684aaa8 WebView AOSP Drop Request - 44.0.2399.3
7711878 WebView AOSP Drop Request - 44.0.2399.3
94fe079 Update WebViewGoogle to 44.0.2399.0
27a628d Update WebViewGoogle to 44.0.2399.0
38b1eb9 Update WebView to 44.0.2394.0.
0aac98c Update WebView to 44.0.2394.0.
f69654b Update Webview packages for AOSP targets to 44.0.2370.2

project external/compiler-rt/
23a87c1 Build the ASAN RTL without RTTI.

project external/conscrypt/
b0e7a58 Fix compilation with OpenSSL
35c2503 Fix error conditions in certificate/PKCS#7 reading
e5d26bc NativeCrypto: special case for empty cipher list
5b59e99 OpenSSLKey: unsupported algorithm is an InvalidKeyException
308eaf6 Throw InvalidKeyException when keystore key malformed
e3834b1 NativeCrypto: allow default exceptions
72ea3d6 NativeCrypto: not finding a key is not fatal

project external/deqp/
eee8271 DO NOT MERGE Split GLES31 copy image tests in 3.
243bc61 Remove infeasible M tests.
498bfb2 Remove tests infeasible for M.
02b40d2 Fix primitive bbox line verification regression.

project external/dnsmasq/
4e0ada9 Properly initialize struct irec pointers after malloc()

project external/drm_hwcomposer/
ad563d4 drm_hwcomposer: Use mode vrefresh if provided
479412c drm_hwcomposer: C++ coding style cleanup, no functional changes.
dda2fab drm_hwcomposer: move atomic modeset calls into a separate worker
36d7c6e drm_hwcomposer: get gralloc buffer usage during hwc_set
aa467a8 drm_hwcomposer: remove unused and confusing HWC_FB_BUFFERS definition.
5757e82 drm_hwcomposer: implement squashing
d683531 drm_hwcomposer: lazily generate shaders for GLWorkerCompositor
766518e drm_hwcomposer: use latest patchset of "separate C compliant header file."
6f82f1d drm_hwcomposer: Remove hwc.drm.use_framebuffer_target property
e7eff73 drm_hwcomposer: separate C compliant header file.
c0b3548 drm_hwcomposer: Add sanity check on display in SetLayers
34b12d3 drm_hwcomposer: fix missing assignment of premult flag
2fddd37 drm_hwcomposer: do not queue layers map for virtual display
d75d8d2 drm_hwcomposer: add missing break statement
d8aefb6 drm_hwcomposer: Use layer alpha to blend planes
fd6dc33 drm_hwcomposer: reimplement Dump for DrmDisplayCompositor
6e02c9d drm_hwcomposer: Do not close duplicate gem handles in nvimporter
92f8e63 drm_hwcomposer: ground work for squashing
806b395 drm_hwcomposer: name the texture samplers individually and unroll loop
19742e3 drm_hwcomposer: fix logic error in premult blending
acba14b drm_hwcomposer: set the composition map's display field
7b1e4bc drm_hwcomposer: Disable planes on frame failure
971be15 drm_hwcomposer: Increase failure time for acquire fences
7e88be9 drm_hwcomposer: improve logging and reliability of some error paths
f99d53f drm_hwcomposer: fix small class consistency issues
a281f8f drm_hwcomposer: small feature/style enhancements for seperate_rects
0867992 drm_hwcomposer: use in-class member initializers for AutoEGLDisplayImage
3a8773c drm_hwcomposer: support the PREMULT blending mode in glworker
e823f64 drm_hwcomposer: Fix EGL_BAD_DISPLAY errors

project external/flac/
2470e51 Add macro definitions for clang/llvm.
cf87d19 Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
1d948ef libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.

project external/hyphenation-patterns/
c15709c Compile the hyphenation patterns to binary

project external/icu/
e1bffda Update timezone data to 2015g

project external/libavc/
533e5a7 Remove __DATE__/__TIME__ from Android builds
66be90d Reconcile branch with master after mass cherrypicks
7ba9f34 Decoder: Memset 8 extra bytes at the end of internal bitstream buffer
e023fbb Decoder: Once all the MBs in a picture are decoded ignore remaining bytes
e027a11 Decoder: Exit gracefully in case of allocation failure
5351d3a Decoder: Added a check for unsupported resolutions
126d84e Encoder added support for VUI params
9d04b13 Moved check for level  after check for resolution change.
0ddd967 Fix a typo in gai4_ih264_max_luma_pic_size
2b0ce2b Decoder: Fixed an issue in handling flush
5934812 Decoder: Fixed an issue in handling flush
aa6ebc2 Decoder: Fixed an out of bound read in intra pred buffers
07ae78b Decoder: Fixed an out of bound read in intra pred buffers
1bff181 Encoder: Fixed an issue in handling FPS greater than 60
4e09125 Fixed few issues seen in CTS tests

project external/libhevc/
3f4863f Remove __DATE__/__TIME__ from Android builds
ac0318f Aligned ps_pic_pu to 4 bytes
e3d6224 Reduced memory requirements
137754b Memset 8 extra bytes at the end of internal bitstream buffer
2938759 Few intra pred fixes in arm functions
b2451d1 Fix in reading short_term_ref_pic_set_idx in slice header
233819f Fixed returning U and V output pointers in shared mode for 420p
e1ba6b5 Added CLZNZ and POPCNT_U32 macro definitions
d0a33c2 Removed calls to strcat and strlen
03ca798 Added SEI structures and reordered ihevc_structs.h contents
6267c11 Simplified error checks for setting stride
55473fb Removed unused thread abstractions
452a0d6 Added few transform tables
3d2ea50 Fixed an out of bound read in accessing inverse scan table
19ca88a Few intra pred fixes
2b67e53 Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8

project external/libmpeg2/
9c9fd7a Remove __DATE__/__TIME__ from Android builds
5ba732e Removed unused thread abstractions
8d60b8a Fixed stack pointer increment in impeg2_idct.s
8520690 Added deinterlacer
903fd2b Fixed few stride issues
f85f2e5 fix CLIP_S16

project external/libnfc-nci/
63183d2 Don't free memory that shouldn't be freed.
e3b367f Fix 256-bit Thinfilm NFC barcode.
f85bfd0 Use global all-cpp-files-under
4c17d25 Fix fail to write RF parameters
c22a07f Fix fail to write RF parameters

project external/libpng/
00376b4 Avoid a harmless potential integer overflow in png_XYZ_from_xy().

project external/libunwind/
338c975 Fix copying of cached map data.
5e3bc6a Verify section table name size before strcmp.
834ed93 Verify section table name size before strcmp.
ce727f2 Fix incorrect check of bool returning function.

project external/libvpx/
cc274e2 external/libvpx/libwebm: Update snapshot
7ce0a1d libvpx: Pull from upstream

project external/llvm/
039ace8 Remove ENABLE_TIMESTAMPS to ensure reproducible builds.

project external/mdnsresponder/
11b8cee Stop building __DATE__/__TIME__ into Android binaries

project external/noto-fonts/
37d9071 Better compression for NotoColorEmoji
221e51b Update NotoColorEmoji font to Unicode 7 and 8
eb08835 Delete smiley and playing card suits from Noto Serif LGC.

project external/okhttp/
6d38599 Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""
87fa390 DO NOT MERGE Revert "okio: increase segment size to 8 KiB"
083b407 Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()
d8d0b08 Fix for HttpURLConnection not always throwing SocketTimeoutException

project external/sepolicy/
9acda2f Enable permission checking by binderservicedomain.
ac8b575 untrusted_apps: Allow untrusted apps to find healthd_service.
33a779f bluetooth.te: Relax bluetooth neverallow rule.
c1cb855 camera: Add AIDL interface for CameraServiceProxy.
9dc28cd Allow MediaProvider to traverse /mnt/media_rw.
324cdd6 Fix sepolicy-analyze libc++.so loading issue w/CTS.

project external/skia/
a1d8ac0a Purge non-NEON ARM code. DO NOT MERGE
3654d7a Purge non-NEON ARM code DO NOT MERGE

project external/sonivox/
a12313f Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized

project external/sqlite/
58a0c48 sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE

project external/tremolo/
3830d0b libvorbisidec: sanity check index of marker.

project external/webrtc/
e4dce38 Remove __DATE__ and __TIME__ from tracing

project external/wpa_supplicant_8/
6ec3038 RSN: Stop connection attempt on apparent PMK mismatch
d9191ea Throttle control interface event message bursts
c481836 Add wpa_supplicant EVENT_TEST control interface command
f715e8d hostapd: Global control interface notifications
26c152a Add debug prints for wpa_supplicant ctrl_iface socket send operations
e97a2ce Update AP WPA/RSN IE on all associations if driver can select BSS
a82c83c Update AP WPA/RSN IE on all associations if driver can select BSS

project frameworks/av/
5dc9ffe Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient.
6c7a59a ALooper::awaitResponse gets reply and returns immediately if the looper is stopped.
606fbc1 Workaround for busy wait bug
0abb2aa Allow ALooper::awaitResponse to return immediately if the looper is stopped.
09c291c GenericSource: reset mDecryptHandle when mDataSource is cleared.
cdc9cf6 GenericSource: reset mDecryptHandle when mDataSource is cleared.
8ee3685 Fix offset adjustment when skipping off-spec meta chunk
5adc76c DO NOT MERGE: libcameraservice: Fix nullptr crash when no client.
224858e GenericSource: reset mDrmManagerClient when mDataSource is cleared.
b41fd0d GenericSource: reset mDrmManagerClient when mDataSource is cleared.
32ab9fd libcameraservice: Fix ALOG prints in FlashLight.
3e60089 Camera: frameworks: Add NULL check for callback
9ddf1c7 audio policy: bind setMode() and setPhoneState() operations
74ce88f AudioPolicyService: fix race in AudioCommandThread
b3d9f56 Reconcile with master after mass cherrypicks
8383565 SoftAVCDec: Exit gracefully when memory allocation fails in the decoder
b4ec8d0 SoftAVCDec: Added a check for unsupported resolutions
ec62e13 SoftHEVCDec: Reduced memory requirements
a3f2952 SoftMPEG2Dec: Added support for deinterlacer
c0a889f audio policy: fix transition from VoIP to voice call on USB
c171c7c audio policy: fix USB mic selection for VoIP
82104eb Camera: Add video recording stop sound
d4a653a Camera: setup vendor tags before get_camera_info
8a4a0ac DO NOT MERGE: Fix setTorchMode support for the old HAL version
aba407f audioflinger: increase shared memory heap size
216f017 NuPlayerDecoder: report error in case of audio sink open error.
a5b4642 NuPlayerRenderer: do not send rendering started message when paused
954ca45 For static obtainBuffer(), do not set mUnreleased if acknowledging flush.
39609a0 AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.
106ceac NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.
8423965 NuPlayerDriver: acquire mLock when needed.
492ccd6 NuPlayerRenderer: always update MediaClock with max media duration.
b345ddc Don't send OnCompletion events when looping
4c6e77f AudioFlinger: Clear record buffers when starting RecordThread
77c185d stagefright: check bounds for MediaCodecList.getCodecInfo
2482595 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
4a03d78 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
014620f SoundTrigger: fix binder call status reporting.
4b710f0 libstagefright: don't reclaim codec when there's buffer owned by client. Notify the client and try to reclaim again in 0.5s.
302b546 stagefright: MPEG4Extractor: allow 'hdlr' box before first track
96a3d9f CameraService: Use SCHED_FIFO for request queue thread in HFR
ab0ea0f DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
8c987fa DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
06871b4 DO NOT MERGE - audio policy: fix commit dea1541f
8ce05c7 DO NOT MERGE - audio policy: validate stream type received from binder calls.
f84e11a Revert "Do not acknowledge flush() on start() for static tracks"
b960ee9 SoftAVCDec: init decoder using updated size

project frameworks/base/
4d70bd7 Revert "Fix race condition when setting default ringtones"
df252d6 Fix race condition when setting default ringtones
49eddaa Block directory selection in openable modes.
1408358 Kick movement preconditions onto handler thread.
d028ee7 Revert "Remove -ffast-math from libhwui makefile"
76cb25b When the incoming light source is invalid, don't generate any shadow
12412ce Early return when the scale is 0.
067470f Remove -ffast-math from libhwui makefile
0929827 Revert "Use clang for libhwui"
b38fcc3 Convert ashmem bitmap thresholds to constants.
b38c1e8 Use clang for libhwui
a2dbe431 Limit persistent ashmem backed fds to a minimum of 128kB.
4232444 Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
73546bb Fix a crash while printing ICCID because of alphabets in UICC.
0d6d12a Fixed a bug where the panel could get stuck closing
613e5fe Improve comment on EXTRA_CALL_RAT_TYPE.
20779c2 NetworkTimeUpdateService: Grab a wakelock when manipulating system time
7ed23d2 Don't try overriding system fixed permissions on install
a8d4225 PackageSettingBase needs to copy volume UUID.
9c648bd Handle "uninstalled" apps when pruning app-ops.
52e3639 IMS: Support For Per-Call RAT Info
4ff3b61 Allow verifier to grant permissions
e3e2c70 Import translations. DO NOT MERGE
bf3347f Get rid of getTypesVisibleToCaller log spam.
c32aacb UsbDeviceManager: set mUsbDataUnlocked=false on user switch
9abc2aa Don't crash if a DHCP server doesn't send the server ID option.
bcefa34 Import translations. DO NOT MERGE
b8afc77 Import translations. DO NOT MERGE
01af6a4 Make SYSTEM_ALERT_WINDOW development permission
aa1c080 Petites fautes.
7682b26 Fix issue #25289999: Lower device idle alarm limit to 10 mins.
7afd89d Import translations. DO NOT MERGE
f6fc9e2 Import translations. DO NOT MERGE
d847ad5 Prevent recents from coming up when in SUW
2452e54 [DO NOT MERGE] EAP-TLS PMKID mismatch error
1044e16 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
51c2619 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
446dcc9 Delay hiding the cast icon for 3 seconds. DO NOT MERGE
0450565 Revert "Revert "Track ashmem memory usage in Parcel""
7730cd2 DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
a665ea7 Remove tether_apndata for Sasktel
e2adb2c Revert "Track ashmem memory usage in Parcel"
79f00cf SystemUI: fix automatic pairing of BT keyboards
ff91ef8 Don't resolve cross-profile app links without intent picker.
9582e15 Fix crash on calling removeSelection with showing selection handlers
0dccd12 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
f7b6474 Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
ab3f972 Track ashmem memory usage in Parcel
865907d Hopefully fix issue #25153459: Sandboxed_process1 thrashing
d542705 Reinstate CHANGE_NETWORK_STATE as a normal permission.
8fd25bf Delay hiding the cast icon for 3 seconds.
68f6715 Maintain shared user list on OTA
3a09c52 Don't query ChooserTargetService apps that haven't been used recently
5d1429e Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
052366c Narrow permission re-granting to specific volume.
990df68 Import translations. DO NOT MERGE
2aaeefe Fix toolbar flickering in ExtractedMode when longpressing.
fde4111 Import translations. DO NOT MERGE
46d50b7 Don't buzz when automatically connecting to captive portals
bbcb331 Correctly derive ABI for apps on adopted media.
b4faf34 Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
2ae7107 Changing the ordering for heads up notifications
f1ddb5e Catch exceptions thrown by pending activity launches.
f5e0452 DO NOT MERGE Race condition in JobServiceContext
b581777 DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
690f18a ignore initial request to disable iptable chain
7d7a225 DO NOT MERGE Sync extras bundle comparison can throw NPE
8ab115a Correct ActivityInfo constructors.
3b8a5ea Re-set PROCESS_TEXT selection if nothing was returned.
01320de Update drawable matrix when bounds change in invalidateDrawable()
a112347 Add locking when mutating RecentTasks.
918b901 DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
56859f3 Ignore network policies with missing IMSI.
ef396b5 Set the bounds on the drawable for ChangeBounds reparenting.
2ee19c7 Retain fragment loaders
2e2069d Fix read_mapinfo to recognize free list large object space
ac0e6ca Set host when restoring a fragment
a05df45 Fix a possible race condition in SensorManager initialization.
c555378 Import translations. DO NOT MERGE
5e48632 Import translations. DO NOT MERGE
c03443b Fix lens shading map origin calculation.
3bab515 Reload content description of KeyButtonView
98713a4 Stopping chronometers now when the shade is closed
1f0ec16 DO NOT MERGE Sanity check loaded periodics and cap runtime.
ffb32b1 Don't allow concurrent permission requests.
063926b count notification peeks by window action
77a533f Fix ChooserTarget app scoring
482e9d9 DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
20ebb4c Disassociate system windows from apps
a620006 DO NOT MERGE: Reduce delay of floating toolbar appearance.
431e506 Fix line height problem with inline images in StaticLayout.
b919876 DO NOT MERGE Change scheduling logic to run network jobs sooner
6a032a3 Don't project ripple for adequately tall spinners
fb34a12 Mask IccId which gets printed in bug reports & radio logs.
fc7476d Fix wrongly laid out navigation color view
f383129 Fix issue #24571425: Device does not come out of idle mode for maintenance
8e2d2bb Add 'until next alarm' option to QS zen panel.
38451b8 WindowStateAnimation: Clear transformation clip rect.
59d28dc Update docs to reflect adoptable behavior.
97eff87 Selectively show zen footer.
3a10b10 Update volume slider on device changed.
4eb9871 Fix bugs introduced in ChooserActivity
35e0269 Load binary hyphen data files
0453112 Make Hyphenator#get() return an object.
b053b3c TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
7013f0c Import translations. DO NOT MERGE
a2ed535 NotificationPlayer supports MediaPlayer errors
f142cac Show charging speed in all locales
d73854d Remove ColorFade resouces when screen off.
de612dc MediaPlayer: remove obsolete function setPlaybackRate from comments.
71d3260 Shorten first boot time by filtering dexopted apps by LRU.
977fe03 BLE-MIDI: change binding for BluetoothMidiService
c024de3 media: ignore null InputStream
9b23f88 Don't crash if an invalid always-on VPN profile is configured.
739d0b0 Unbind IME client when unsetting the current IME.
c14a11e Ensure we update the active pointer id on pointer up/down.
af3e489 BluetoothMidiDevice: change write type to support JamStik
ff7b92f Shared user retains permissions no longer used by any app on an app update
b02ce29 "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
7688911 MidiBluetoothService: add new device to HashMap
afa038c MidiManager: fix double BTLE callback
e39def4 MidiService: update listener with current status when registered
412e7c8 Adding config to allow/disallow user to add APNs.
06c07a1 Add additional density enums to android:screenDensity attribute
1b79ad7 Fix issue #23581553: Ignore Battery Optimization not work for re-install app
5c18d05 Use effectiveUid instead of callingUid to set lockTaskMode
6be61a9 wm: call displayReady for all built in displays when system is ready.
9209c9c Add SystemUI component to watch for keyboard attachment.
ac3b53a Import translations. DO NOT MERGE
4e4d59e Connect the DHCP UDP socket to the server.
958b9d2 Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
d22b9b7 [RenderScript] pass correct length of ains to BLAS functions
c88a2d5 Default location is "internalOnly" when undefined.
1078942 Safely handle interrupts during Thread.join()
93db3d4 Retry if interrupted before mMessageThread has joined
64f4f98 Actually apply after no sims change.
025f4a5 Support DHCP replies with multiple default gateways.
b19238c Accept DHCP responses from non-67 server source ports
496906e Improve logging of DHCP parse errors using exceptions.
d6af66e Correctly reschedule failed periodic
3832a24 ZenModeHelper: fix cross deadlock with AudioService
b7b5812 Don't call StopRecognition when recognition was aborted.
3b49317 Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
6ef8578 Add animation and positional stability to intent chooser UI
3c12a7c Hold wake-lock during copy operations.
a43a96b Add ESC mapping for Pixel C keyboard
4608f10 Add layout and keymap for Pixel C Bluetooth keyboard
4709ef0 Fix jank: Don't write lockout deadline if not needed
4d4d838 Bump BatteryStats version
f511009 Show charging speed when time to full is available
ec6fcf2 Give the DhcpClient alarm broadcasts foreground priority.
e7a3435 Docs only change: update build version docs.
93a867f Fix Array Index Out of Bounds in BatteryStatsImpl
c99b393 Frameworks/base: Propagate boot status to installd
5c4a86f Enforce a timeout for Content Providers to be published.
53d1908 Add support for setting color transforms
91da9a0 set config_use_sim_language_file false for SE Telia/Sweden 3G
1cfd031 Fix crash when no power_profile is specified
6b8e7a0 BatteryStats: Better big-little CPU accounting
af06e9c Allow non-persistent manual network selection.
358ebb3 Allow camera launch also when device is interactive
9c1f522 Framework fixes for RSSI offload.
d4920e6 extend svc command to control NFC state
5722415 Default grant SMS and Phone to the verifier
f89e800 Send next alarm's show intent via PendingIntent
5ded7af Fix parole scheduling bugs.
dc98806 Push firewall rules up to ConnectivityService.
5162a1d Add to configure for MDC_INITIAL_MAX_RETRY
30ed8ca Add op package to the UID special case handling in account manager.
2f68422 Add carrier config for specifying invalid characters.
5096d9e Don't include password on default encryption command
da527ef Do not show roaming icon for some operators of Chile
898db05 Fix broken enter key after failed PIN attempts.
0f1848c Fixed a bug where the secure camera would flash when rotated
541ada3 BatteryStats: Start using cpu power from kernel
f9f7161 Fix NPE in AR hardware binding sequence. b/22772433
ffdc2ad Translate ripple mask to account for drawable bounds
971ddf0 Fix wakelock leak for dozing
34d580e Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
0f515af Avoid use-after-free race condition when rebasing theme
49db74f Don't dispatch when non-interactive and the display is off.
da4371d Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
f4fcfd2 Fix app ops regressions introduced by the per UID policy change
c9cbe42 Fix crash in kModeProcessNoContext
ff2b059 Ensure per package and per UID state share same package settings.
1dac151 Remove spurious syncmanager wake-ups
b6ead7d Revert "Permissions: GET_ACCOUNTS permission cleanup"
419bc8f Expand ringtone titles to support OGG and FLAC.
f346540 Fix NPE in AppOpsService
52d1a6b Bug: 22879202 App compatibility with WRITE_SETTINGS failing
80c8865 media: Clarify MediaCodec and CodecCapabilities documentation
e08a3c8 Fix SysUI crash on device boot.
f3e2dff Make DateTimeView more robust to weird contexts.
2b3dfd4 Make the RemoteViews context safe for Icons.
12097ac BatteryStats: include mobile radio active count and unknown time in checkin
332d06a Add OrSelf to privileged permission check.
7edc103 Introduced android.permission.PEERS_MAC_ADDRESS permission
e576ebe DateTimeView: don't assume you have an ApplicationContext.
6bec2f7 Include non-zero dimension views in excess space calculation
879a66b Default grants: handle update system packages
4d2ce01 Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
720b2cd Work on issue #22765972: Binder transactions running out of address...
be0acad DO NOT MERGE Enhance local log.
cb185b1 Properly synchronize interactivity state.
1c41d9d UsageStats: Gracefully handle corrupt filenames
66bf17de Don't crash sysui when advisory calls fail.
6edf339 Add callback to voice interaction session for lockscreen shown
cca016b Do not auto grant GET_ACCOUNTS as it is temporarily normal
664794d Temporary lower GET_ACCOUNTS protection level
1f2e9c5 DefaultPermission: GET_ACCOUNTS is now in CONTACTS
4becfb4 Make sure we get valid package name or fail.
0a8cea3 Grant default permissions to the setup app robustly.
ac3f531 Give DCS permission needed to measure all users.
d41c1bc BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
f340a22 Clear binder id when determining external storage state
e38a963 Add checks for READ_PRIVILEGED_PHONE_STATE.
221b85f Prevent null allowableAccounts from crashing
906cf82 media: Implement getAchievableFrameRatesFor with measured frame rate.
364c76e Check user state after clearing identity.
0e086d9 Fix new user creation regression due to vold remount calls
6d2f77a Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
6560052 Fetch the Bluetooth name and address without enabling the whole stack
08559d9 Debug logging for a certain class of binder transaction failures
942e2d1 Fix opening secured networks from QS
1c1ae5d Fix FloatingToolbar flickers.
99c9d77 Patch up certain kinds of broken notifications.
d6ff9a4 Write packages.list when granting permissions.
52f6709 GetInstalledProvidersForProfiles should never return null object.
2454e76 SubscriptionManager: Fix NPE in getSimStateForSlotIdx
7eba08f Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
a987271 Fixes for Region_writeToParcel.
fa8058d Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
7c40a8b Fix null deref
0c05f3c Changed BugReportReceiver to send zipped bugreports.
7ec39a9 Revert write secure settings permission protection level.
54d387c Check targetSdkVersion when passing size hints for UNSPECIFIED specs
3cfc49a Protect against null detail record.

project frameworks/minikin/
8654279 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE
c5af5f6 Accept variation selector in emoji sequences - DO NOT MERGE
e8264e0 Complete half-done cherry-picking of Android.mk. DO NOT MERGE
e5e7aa0 Explicitly set utf-8 encoding for hyb file verification
6e2cccd Binary format for hyphenation patterns

project frameworks/native/
20483c4 Avoiding flush on-change sensors at subscription
6bb3114 Maintain Parcel ABI
cbf3726 Revert "Revert "Track ashmem memory usage in Parcel""
6880307 Revert "Track ashmem memory usage in Parcel"
778b6f4 DO NOT MERGE: fix build try #2
834ac20 DO NOT MERGE: fix build breakage
e2f499f Track ashmem memory usage in Parcel
5d17838 add number constraint for samples per MotionEvent
312d755 egl: Remove window disconnect before calling driver eglDestroySurface
552a8a5 add number constraint for samples per MotionEvent
0faaa0b Inputflinger: hook up key event replacement processing
115f93e Allow defining replacement key events in keymap
c1e6fbb Initialize local variables to avoid data leak
fa2d40f Installd: Take boot status as dexopt parameter
38b4b28 Installd: Allow different behavior before bootcomplete
f9b7f85 Set DATA_INJECTION mode flag for sensors.
5a373bb Revert "Bug fix in SensorManager."
8a715c6 Revert "Modify EGL to disconnect the window when the surface gets destroyed."
37c6aaa Fix broken NDK sensor manager API.
6d09ca8 libgui: Clear frame number while freeing slot

project frameworks/opt/net/ethernet/
3e81fb6 Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.

project frameworks/opt/net/ims/
57911d1 IMS: Add check for GBA SIM
14077be IMS: Dont clean merge info on host termination
6734cfa Fix typos

project frameworks/opt/net/voip/
11d941a Fix JNI registration error

project frameworks/opt/net/wifi/
78ca9b3 Don't set RSSI to -1 when no value is returned
dd772a1 [DO NOT MERGE] Fix build breakage introduced by CL 797896
eb5caea [DO NOT MERGE] EAP-TLS PMKID mismatch error
1f8a913 Disable Portable Wi-Fi hotspot in ECM
a15a2ee Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]
20de5ba Security Vulnerability in android::onPnoNetworkFound
8b41627 Fix a race in WifiNative objects
a8ed84c DO NOT MERGE Make sure wifi driver is actually turned off when requested
65ada07 Fix foreground scans for pre-M apps when location is disabled
12167e2 Do not throw an exception if appop's result is MODE_IGNORED
03dab7e Prevent corruption of Wifi scan battery stats
56845c3 Set hs20 property to 1 when connecting to passpoint network
ac1f408 Fix center frequency parsing bug.
d3ae426 When entering disconnected state imediatly start a scan
5e3dba9 Handle supplicant state changes in non-ConnectModeState
7421421 Don't hold on to last scan results if scan is empty
57b8152 Don't reset country code on mobile signal loss
c682e28 Make sure to cleanup rssi cmd before starting new one
130d82f Remove all scans before scheduling a new scan
33f16be Wifi fixes for RSSI offload.
2b31a45 Allow active network scorer access to scan results.
25849cf Use PEERS_MAC_ADDRESS permission instead of isSystemProcess
b29cd16 Synchronize getScanCapabilities() with other commands
61cff90 Added guard around IMSI parameter.
d74dd1f Disable long running chronograph thread
9bdb759 Temporarily disable wifi logger
71d35cf Fix a null pointer exception in logger
859cb73 prevent false wifi roaming signal Bug:21617059
c950374 Wifi log spam is still a thing
ffb8a38 Fix an ANR in WifiSettings
7cff882 Fix bad logs and a crash while reading configs
4edaa6b Indicate failed scans with EXTRA_RESULTS_UPDATED
bc73c21 Fix bad logs and a crash while reading configs
2efb0fe Indicate failed scans with EXTRA_RESULTS_UPDATED
ffcef0b Fixed bad network history saving and reading.
fe3bce4 Interpret scan-failed event from wpa_supplicant
58f405c Check for null return from getRingBufferStatus
2da5dad create IpReachabilityMonitor only in L2ConnectedState
ed9b240 If the interface at start-up isn't valid don't NPE on missing IpReachabilityMonitor
b56701c Only notify of new link properties if they are non-null
78980d6 Initialize wifi_set_nodfs_flag with a stub
0b1cd62 Fix unhandled CMD_GET_MATCHING_CONFIG
0d5b0fb Fix NPE on devices without DPM service

project frameworks/opt/photoviewer/
e3bc739 Talkback shoudn't announce Photo details twice.

project frameworks/opt/setupwizard/
8fab689 Import translations. DO NOT MERGE
edb6d10 Import translations. DO NOT MERGE
0d73002 Import translations. DO NOT MERGE
fb74042 Import translations. DO NOT MERGE
c5820f8 [SetupWizardLib] Implement SetupWizardListLayout
eea7ecd [SetupWizardLib] Configure gradle
125bfc3 [SetupWizardLib] Remove SetupWizardLayoutHelper
4dad307 [SetupWizardLib] Add more themes
2853c9e [SetupWizardLib] Themes and attrs support
09546ca [SetupWizardLib] Implement LayoutHelper.setIllustration
2536b1e [SetupWizardLib] Remove deprecated styles
16876d4 [SetupWizardLib] Rename attributes
b668cbb Import translations. DO NOT MERGE
3ab8deb [SetupWizardLib] Implement SetupWizardLayout
4ad94c5 [SetupWizardLib] Provide templates in library

project frameworks/opt/telephony/
edb3e72 Fix a crash while printing ICCID because of alphabets in UICC.
09ee5a4 Set WIFI icon for connection based on connection extra.
30c5eb9 Change gid-matching process
eadee84 Save call forwarding flag in SharedPreference.
553db65 Ensure connection extras set before connection start are passed through.
92760e1 Fix data connection issues introduced in a7228870
9a6ccba Revert "Revert "Fix HD icon shown for MO VoLTE call when it shouldn't""
583b14c Revert "Fix HD icon shown for MO VoLTE call when it shouldn't"
059a9a5 DO NOT MERGE Add delay between postdial DTMF tones for CDMA.
497d54c Mask IccId which gets printed in bug reports & radio logs.
edd4a38 Hide IccId from SubscriptionController logs.
682afe0 Fix handling for no default phone.
0811160 IMS: Fix ArrayIndexOutOfBoundsException
3f545d6 Fix handling of connect req while connected.
bdbd981 Get display manager state after registering with DisplayManager
a722887 Fix use of memorized phoneId.
7302701 Change to add user_visible field to Carriers table.
70162e4 Allow non-persistent manual network selection.
651b14d Fix useImsForUt check
619ffba Fix race in dafault phone creation
4a1b3aa Fix other Disconnect msg senders
354a798 Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators
1079b79 Remove carrier-defined invalid characters from call subjects.
ca6d1ec In PhoneProxy query voice RAT after CarrierConfig is loaded.
c381c69 Change to dispose Gsm/CdmaConnection to make sure wakelock is released
549bf29 Don't set prefer network type on RIL connected.
d8f8a80 Don't process NetworkRequests when there are none.
97fd7f5 Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."
12e0efb DO NOT MERGE Add logging to detect the start of a sync problem.
f797c47 Add logs to PhoneFactory
91d6a48 Dont fail if modem ids are empty.

project frameworks/opt/timezonepicker/
c738691 Import translations. DO NOT MERGE

project frameworks/rs/
5126e3e SetError if forEachMtlsSetup fails sanity check
abb535b Handle older structure sizes by zeroing new fields

project frameworks/support/
64ece2d Retain fragment loaders
e4148d6 Set host when restoring a fragment
8b97716 Fix minor doc bug on DocumentFile.
14222d5 [RenderScript] pass correct length of ains to BLAS functions.
b5e36c2 Get support lib ready for release
c2931bc [RenderScript] fix support lib after Native RS API change.
72d9f6b Update current.txt, fix build.

project hardware/broadcom/libbt/
6e49363 libbt conf file for google gce_x86 devices

project hardware/broadcom/wlan/
06a2d34 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)
25e0325 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)
047718e net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)
783daf7 Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)"
5daef7b Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)"
fa54002 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)
2964f10 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.27)
69ef000 net: wireless: bcmdhd: update bcm4358 FW(7.112.100.17)
bc349f9 net:wireless:bcmdhd: Update bcm4354/56 FW (7.35.79.94)
b97f770 Fix couple of issues with unregistering event handlers
c6e2679 Fix incorrect wifi_cleanup
da3607d Fix a deadlock in wifi_cleanup

project hardware/intel/common/omx-components/
a2f2b42 fix random SEGV issue which is caused by wild pointer in libmix

project hardware/libhardware/
419c27b Do not reset out_get_presentation_position() to 0 on standby
2d6c8d7 Fix DATA_INJECTION flag in sensors.h

project hardware/libhardware_legacy/
8f6356c make wifi_load_driver blocking

project hardware/qcom/audio/
50a38ed hal: fix mic selection for IN_COMMUNICATION mode
971e072 hal: Add support for perf lock management (continued)
c075069 Configure platform msm8960
7246fb6 Define max number of channels for msm8974
94f9356 Add support for voice recognition on headset use case
a2981ba hal: Fix EC not working with some VoIP app
c8f47b3 audio: set voice call volume step by property

project hardware/qcom/camera/
0fe6077 QCamera3: Fail unsupported stream configurations
27d6d35 QCamera2/HAL3: Read v4l2_buffer error and notify accordingly
996d10f Camera3: disable the image description exif field
36dc0e2 Camera3: Adding checks for stream handle
b08201f QCamera2/HAL3: Clear mFreeBufferList when buffers are deallocated
d0a6580 Camera3: Increase mOfflineMetaMemory count to account for reprocess pipelining
b55c177 camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.329
dc778bf camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.312
369a1d3 camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.309
a07d40d Camera3: Reduce the max inflight buffer count for BLOB
07a78df camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.297
507f6aa camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.276
e630303 Camera3: Disable CDS for EIS
fcb371e Camera3: Temporarily disable log error until b/22952640 fixed
d75e6d3 camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.254
8ef25fb camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.251
9256af5 camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.237
d0ae01e Camera3: Make the reprocess crop data agnostic to stream id
a514f17 Camera3: Add conditional for model info in EXIF
b243b0b camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.199

project hardware/qcom/display/
25016fd hwc: fix compilation issue on backport of Ieb91b70 [DO NOT MERGE]
0787bc2 hwc: Move max app layer check outside isFrameDoable routine.
95c2601 hwc: Fix MDP comp array index access
4566052 hwc: Fix to avoid heap corruption
786abf1 gralloc: 8974: handle YV12 format in lock_ycbcr

project hardware/qcom/media/
61f5b8c mm-video-v4l2: vdec: notify colorspace info only if present
0a07b0c mm-video-v4l2: vdec: Enable VUI extradata only for h264
ad02132 mm-video-v4l2: vdec: Enable VUI extradata only for h264
dd82610 encoder: increase the input buffer count from 9 to 12
9d89541 mm-video-v4l2: venc: Update low power mode for 4K recording
5e28297 mm-video-v4l2: vdec: Handle empty EOS buffer

project hardware/qcom/msm8994/
69933ad msm8994: update kernel header
e3fa5e3 msm8994: update kernel header

project hardware/qcom/wlan/
0f5735c WiFi-HAL: Cleanup additional unnecessary logs
57b2b53 WiFi-HAL: Initialize the bssid hotlist ap lost member variables
be26b0f WiFi-HAL: Write header and payload to same buffer
1e594c5 WiFi-HAL: Write and read data to/from ring buffers record wise
16f09fc WiFi-HAL: Unlock mutex before calling framework callback
66fb901 WiFi-HAL: Donot initialize Lowi module for gscan calls

project libcore/
6de5831 Patch for awaitNanos() for coarse-grained clocks
fc71122 Fixes associated with the tzdata 2015a update
bb97fad Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
392416f Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
43c137b ProviderTest: Add provider name to failure message.
2905371 libcore: removed unnecessary code in SSLSocketTest
39768a2 Send SIGQUIT when finalizer times out
8442a3b SSLEngineTest: set up server instead of using anon
e135be3 SSLSocketTest: add test with no ciphers
f192521 Fix X509CertificateTest.testVerifyPublicKeyString failure.
bcdfeb2 Relax the test for inappropriate fallback
3592cd2 No need to test EC keys of 192 bits
6fb716b Add test_PacketSocketAddress to the list of known failures.

project packages/apps/Bluetooth/
b211df6 Remove Vcard filter for call-logs
66d6430 Fix file permissions for Bluetooth share
4a9f9b0 Fix foreground scans for pre-M apps when location is disabled
faf199e SAP: Fix missing connect response when call ongoing at connect
7a8bcb3 Revert "Disable Bluetooth profiles that are not used on Clockwork."

project packages/apps/CarrierConfig/
b9b1759 IMS: Enable check for GBA support on T-Mobile's SIMs
97cbe3d Adding config to allow/disallow user to add APNs.
fc33756 Set carrier-specific invalid characters.

project packages/apps/CellBroadcastReceiver/
3d91c54 DO NOT MERGE. Fixed emergency alert TTS not playing on bluetooth speaker.
170b39b Fixed that emergency alert reminder does not trigger every 2 minutes.
99f1ed7 Fixed that "Turn on notification" does not work.
3f85c34 Fixed that "Turn on notification" does not work.

project packages/apps/Contacts/
476f970 Check for WRITE_CONTACTS permission
ffaae27 Add back READ_EXTERNAL_STORAGE permission for vcard import 1/3
156d198 Check for null getCurrentFocus(). Fix NPE
7698504 Guard against null listener when picking contacts

project packages/apps/ContactsCommon/
44182ce Import translations. DO NOT MERGE
331428f Import translations. DO NOT MERGE
4a36f01 Import translations. DO NOT MERGE
b683c00 Make LetterTileDrawables bold
0b28759 Correctly handle empty permissions array in callback
c544a6c DO NOT MERGE Catch SecurityExceptions in onCreateDialog
ebcbbbe Add back READ_EXTERNAL_STORAGE permission for vcard import 2/3

project packages/apps/Dialer/
f4b1101 Fix NPE in requestContent
ccf6c7a Correct issue where content of "All" and "Missed" tabs reversed in RTL.
f72637d DO NOT MERGE Handle null contact lookup.
a6578e2 Permission protect UndemoteOutgoingCallReceiver
fb8c572 Fix SecurityException in DefaultVoicemailNotifier

project packages/apps/Email/
dcb985e Import translations. DO NOT MERGE

project packages/apps/ExactCalculator/
341e4d2 Import translations. DO NOT MERGE
9bc3f44 Correctly set formula text size after rotation
26dfa3d Import translations. DO NOT MERGE
ec7517f Check for decimal point after adding ellipsis
9192d5c Cleanup of timeout handling and message
f6033a4 Implicitly clear on incomplete keyboard input
6ab94a3 Generalize % operator: Handle 100+10% as expected
e4b8ff7 Don't evaluate a lone decimal point to zero
3d4a67d Address FIXME comments from previous cleanup CL
4d63cfc Announce when formula has been completely deleted.
9ad6f6d Fix factorial(0)
4171812 Add docs directory and contents
fc8a8d3 BoundedRational.java cleanup
b13daf1 Evaluator.java and CalculatorExpr.java cleanup

project packages/apps/Exchange/
040b855 Import translations. DO NOT MERGE

project packages/apps/InCallUI/
de77e31 Show child number in incoming call notification.
24ad929 Fix bitmap leaks in InCallUI
a438895 DO NOT MERGE Null check CallList mapping in callbacks
c6f6f98 Null protect getUi() in configureAnswerTargetsForSms
19fe178 Remove reliance on getDefaultDisplay() to determine screen rotation.
3f93da9 Fix NPE for video card when VT not active

project packages/apps/ManagedProvisioning/
9e7ee61 Add extra checks and timeouts to account migration. DO NOT MERGE

project packages/apps/Nfc/
eee1696 Don't enable reader mode when NFC is disabled.
e208aeb Use global all-cpp-files-under
face8fb Reset P2P flag in de-initialization.
b835ad8 Add LOCAL_MAC_ADDRESS permission.

project packages/apps/PackageInstaller/
6986f29 Auto grant permissions in an already granted group.
86f1ee8 Revert "Auto grant permissions in an already granted group."
c7e595a Auto grant permissions in an already granted group.
9b9010b Use unique preference key.
851c5c4 Revert "Grant only requested permissions not the whole group."
cc257aa Revert "Show multi-permission UI in the requested order."
32c4cb1 Show multi-permission UI in the requested order.
7d765a8 Grant only requested permissions not the whole group.
0dec9ef Make package installer a privileged core app
42a436a Don't show permission with no app ops.
948d9f7 Fix truncated permission message if 'Do not ask again' is shown
20da6fd Add logging for user permission interactions.

project packages/apps/Settings/
46742e0 Null check queryIntentServices
91e50a2 Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
a0fc2b8 Fix issue #25371736: Don't include z-ram allocations in Android OS
260d90a Import translations. DO NOT MERGE
c338bac Import translations. DO NOT MERGE
6e2e8e1 Fix crash in Settings from uninstall
a489856 Import translations. DO NOT MERGE
36866c8 Allow access to permissions, even if app has none
3a7368e Import translations. DO NOT MERGE
02551ec Hide empty data usage cycles.
417a050 Hide SIM and IMEI for wifi only devices
3105ea3 Clamp large data usage values.
7f62f29 Import translations. DO NOT MERGE
f191953 Import translations. DO NOT MERGE
77b11fa Fix crashes in Settings
cabb62f Bail if activity was destroyed.
d71db4f Import translations. DO NOT MERGE
46eb185 Import translations. DO NOT MERGE
974dfc1 Import translations. DO NOT MERGE
c311c94 Unconfigure the lockdown VPN if the user forgets its profile.
c16b10e Import translations. DO NOT MERGE
0ec2f9f Import translations. DO NOT MERGE
4fedc0f Import translations. DO NOT MERGE
f598d0b Import translations. DO NOT MERGE
90de3be Disable app-link preferences for browser apps
5787be3 Change to add user_visible field to Carriers table.
f01ee19 Add a dummy string to help to add "fingerprint" to search
1a62772 Add color transform setting
70df4c5 Update implementation to match BatteryStats.Uid
dab743b Always show pairing dialog for device-specific keyboard.
fc797d6 Adapted string length translation limits
85aa7bb Stop crash on repeated enters on virtual keyboard
80a4228 Added android.permission.PEERS_MAC_ADDRESS permission
ab9c314 Do not throw exception when MeasurementDetails.mediaSize is empty
0001e8b Fix opening secured networks from QS
724cb3a Allow give/take in app version/disabled fields

project packages/apps/TvSettings/
ebd4809 Import translations. DO NOT MERGE
f9ebdec Import translations. DO NOT MERGE
f995238 Import translations. DO NOT MERGE
af5df64 Add Usage and Diagnostics to main screen
cba60bd Fix NPE in storage migration settings
0a2ae62 Scan storage volumes post-setup
ca5b374 Don't show storage pop-up if setup is not complete
90c2cee Don't show storage notification across users
ca38905 Do not throw exception when MeasurementDetails.mediaSize is empty
8ca01a9 Fix daydreams for restricted profiles [1/2]
231e39f Fix crash in wifi connection activity
e75daf6 Don't crash settings when cast is disabled
1774be5 Handle android.settings.APPLICATION_DETAILS_SETTINGS
f34dc23 TvSettings should not listen for GMS location intents
3f12a33 Add format progress and slow drive warning

project packages/apps/UnifiedEmail/
76d7877 Import translations. DO NOT MERGE

project packages/inputmethods/LatinIME/
41396aa Unicode 8.0 emoji additions to Google Keyboard.
2ca6cea Revert "Unicode 8.0 emoji changes to Google Keyboard."
397fa0b Revert "Add description strings for Unicode 8.0 new emoji."
b18083a Unicode 8.0 emoji changes to Google Keyboard.
cd9814c Add description strings for Unicode 8.0 new emoji.
28e6585 Do not start in recents tab if we do not have recent emojis
1fdb8f3 Define shortcuts for toggling IME layouts.
de674ac Re-activate emoji keyboard shortcut.
53a476d Turn off split keyboard
466446b Do not call AccountManager apis in mnc keyboard
adf5f94 Fix rollback to edemame-release.
3195b6e Import translations. DO NOT MERGE
9f7d08a Import translations. DO NOT MERGE
dbbfc33 Import translations. DO NOT MERGE
ac8c017 Import translations. DO NOT MERGE
6637533 Import translations. DO NOT MERGE
6112555 Import translations. DO NOT MERGE
0be07e9 Import translations. DO NOT MERGE
29b184e Fix a NPE
f14cc29 Fix oscillations on ICS
7249604 Fix the base character of D with stroke
12acf4c Rename a confusing method name
37becdb Fix emoji key background of Holo themes
7ca950a Fix a bug where LatinIME would recorrect with no input view
6fc9289 Fix Greek accented upper case letters
ef37558 Fix possible NPE in SubtypeSwitcher
44a1e49 Import translations. DO NOT MERGE
1665022 Fix Emoji key feedback
12b5311 Fix symbol letter size of phone/number layout
fe81072 Fix number and phone keyboard visual glitches
8551a94 Fix MainKeyboardView visibility must be aligned with main keyboard frame
99be8fc Small comment fixes
eaacc73 Import translations. DO NOT MERGE
59020bb Fix a concurrency bug that ends up in a crash.
2abe6d6 FIx potential NPE
7f61a61 Import translations. DO NOT MERGE
0b9b1d4 Import translations. DO NOT MERGE
0809241 Import translations. DO NOT MERGE
0da7091 Fix missing Telugu letters
629cc2e Enforce a length limit to auto-correction for some languages
ae4833b [ML27.1] Allow adding additional features to other settings
6d392aa [ML29] Reinitialize the subtype at input start
7d04e94 [ML25] Add an hasDict method.
cb1a2bf Fix a bug with no suggestions flag
e63d262 Bring back long press timeout settings
86103be Import translations. DO NOT MERGE
ff6ed9b Import translations. DO NOT MERGE
eb1f44a [ML24] Add facilities to read the script of a subtype
3a5f357 Performance fix for multiple language subtypes
bb4ca89 Fix an NPE.
1fdaf5a Fix: BoS bigram from user history dictionary is too strong.
dc5afca Import translations. DO NOT MERGE
c9a2998 [ML23] Introduce a different accuracy/performance tradeoff
b0f3e62 Fixing keyboard theme selection
eb35b01 [ML22] Improve the language on spacebar for SLS
70d353a Always show the typed word in recorrections.
c758935 [ML20.1] Move getRichInputMethodSubtype to additional features
e92693e [ML19] Actually switch the language when appropriate
82afa80 Add keyboard shadow
fc153d2 [ML18] Make WordComposer#getAutoCorrection a word info
cda578e Stop dimming main keyboard while showing more keys keyboard
ea35b77 [ML17] Add a method to switch the most probable language
7f713e4 [ML16] Remove DictionaryFacilitator.getLocale()
430c5e9 [ML15] First step in removing DictionaryFacilitator.getLocale
7a15471 Fix NoClassDefFoundError due to CursorAnchorInfo in K
b1bc456 Fall back to default keyboard theme
790fe09 Import translations. DO NOT MERGE
af58700 Import translations. DO NOT MERGE
fce5103 Import translations. DO NOT MERGE
de9364e Fix a bug where mic/emoji key wouldn't work.

project packages/providers/CalendarProvider/
5d19871 Work on issue #25467052: System lagged out

project packages/providers/CallLogProvider/
349e0f4 Add a check for full-memory-backup user awareness.

project packages/providers/ContactsProvider/
ade78bd Add READ/WRITE_CONTACTS permissions to ContactsProvider
b50aef5 Update calllogbackup's new package name.
5530424 Fix NPE in enterprise API & fix unit tests.
6ad275e Fix NPE in CallLogProviderWorker

project packages/providers/MediaProvider/
2e1abd8 Allow deletion of media through SAF.
bddb770 Media provider clears binder id calling in other providers
8a9b0a8 MtpService always expects a start intent.

project packages/providers/TelephonyProvider/
f596d65 Try-catch for deletePreferredApnId()
d4091e0 Upgrade telephony db (carriers table) only if needed.
91c5dff Change to persist preferred apn across OTA upgrades.
da60721 Change to add user_visible field to Carriers table.
9f86017 Adding try-catch block to catch an unexpected exception causing crash.

project packages/providers/TvProvider/
7c77230 DO NOT MERGE: Change permission strings to comply with the system permission UI

project packages/providers/UserDictionaryProvider/
8f85e85 Import translations. DO NOT MERGE

project packages/services/Mms/
71ffc0a remove active sub ID check for mms download

project packages/services/Telecomm/
d9f9006 Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
50950a4 DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.
370a7a3 DO NOT MERGE Fix getAllPhoneAccounts() api method
7686cd1 Specify user when setting MUTE for a call.
bba6d6a Make InCall wakelock non-reference counted
4d7c250 Format missed number in missed call notification.
c9dc8e9 Change requirements for emergency call timeout
10defd6 Add OrSelf to privileged permission check.
5c88a92 Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
d89dff3 Add checks for READ_PRIVILEGED_PHONE_STATE.
e28c3cc Mark all SIM accounts as enabled.
44bc828 PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.
a501e99 Use setIntentExtras instead of setExtras.
26cf8c2 Add a slew of clearCallingIdentity() invocations to telecom.
d6859ed Fix crash caused by incorrect permission in TelecomServiceImpl.

project packages/services/Telephony/
fbd58ff Revert "Ensure sim contacts import screen supports rotation."
092d26a Ensure connection extras are propagated on start of call.
2388cfd Import translations. DO NOT MERGE
0d9e7eb Import translations. DO NOT MERGE
049b3bb Import translations. DO NOT MERGE
fff1c1d Prevent DISCONNECTED unknown connections.
750de1a Import translations. DO NOT MERGE
da19cf8 Set network type to ro.telephony.default_network if hiding preferred network type
27785ea DO NOT MERGE Disallow call unhold if the fg call is dialing.
6c85d10 DO NOT MERGE Double-check SIP state before issuing a swap-calls command.
aaf4c41 DO NOT MERGE Fix externally reported security vulnerability.
a22e9cd DO NOT MERGE Shorten "Call settings" string.
03ff466 Ensure sim contacts import screen supports rotation.
a23daed IMS: Disconnect children before ending conference call
d508f95 Enable TDSCDMA mode when connecting CMCC roaming network
97a49ce Allow non-persistent manual network selection.
9ed0620 Hide Network operators menu when user selects the Global Mode for VZW
0eb79fe Only mark as read voicemails with the "is_read" flag set.
644370a Use SSL connection for T-Mobile.
01ba6a9 Add OrSelf to privileged permission check.
27e96c4 Add better logs. Ignore all duplicate phone state changes.
768defa Add checks for READ_PRIVILEGED_PHONE_STATE.
c94a613 Include disabled accounts when cleaning up telephony accounts.
57ed82c Check if mImapStore is null before attempting to open folder.
286171b Adding temporary logging to debug CTS failure (for CellLocationTest).
4caa896 Revert "Save config to disk to avoid binding."
2503dce Lookup SIP Profile using profile name instead of URI.

project platform_testing/
5d0a121 youtube jank test fix
0152330 Jank Micro benchmark nit fix
a6cb612 update resource id per new GSA drop
5076c38 jank microbenchmark more tests
2a62079 Jank benchmark tests for APIDemos
bdeec7f test apk name correction
7055886 More system app jank tests Simple usecases for Books, Camera, Chrome, Gmail and Maps
35cfc45 Package name fix for Youtube fling test

project prebuilts/clang/linux-x86/host/3.6/
497ea58 Update host ASAN prebuilts to not use RTTI.

project prebuilts/gradle-plugin/
e08d97a Add Gradle Plugin 1.4.0-beta6.

project prebuilts/misc/
e97ddac Update UiAutomator prebuilt with tool type support.
d48c03d update jank test helper
ce76828 update jank test helper
4100142 Update layoutlib_api-prebuilt to v15.1

project prebuilts/qemu-kernel/
805d4ae Update x86 and x86_64 kernel images [DO NOT MERGE] automerge: baaba1db6d  -s ours automerge: 1e01450b8b  -s ours automerge: 25a197bba5  -s ours

project sdk/
5830261 DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

project system/bt/
3e8755e Always update remote address type during LE scan
903777d Fix bug in SDP 128-bit UUID lookup
1a3139b Do not mask out secure connections (SC) bit for BT <4.2
eb6b364 Serialize remote version query over LE
4f7c4f6 Check remote LMP version before enabling secure connections
b335ee9 Prevent integer overflows during GATT signing
59d9673 Reduce persistence on aquiring master role
730a12a Raise alarm callback thread priority
deb1c7c Fix 128-bit UUID byte order for GATT-over-BR/EDR
1a72d84 Workaround for H4 HCI stream corruption during LE scans
8289925 Remove absolute volume control whitelist
852bf49 Add Flic smart button to interop database
9113236 Disable opening network debug ports for security reasons
657f6c1 Ensure thread priority is raised for media task / UIPC
c6b5018 Change UHID socket to be non-blocking
b2164f2 Additional BDA range for Nexus Remote secure connections blacklist
c7c8a40 Move pairing auto-retry workaround to new interop db
b49a8b3 Fix memory corruption due to BLE multi-adv macro
30ae983 Fix build after cross-key issues broke non privacy enabled builds
2b9c1e6 Include osi_module reference in module_init funcion
951a1fb Only register key types with uinput that we can actually map
b0fd32a Ensure PAN is initialized before invoking callbacks
11adcf8 Stop media task alarm when task is exiting
1d835f6 Add LE device to device database before adding LE keys
5378ddd Keep track of pending LE background connections
1f30f1c Cross transport key mapping fixes

project system/core/
a611696 logd: pruning time horizon
eb88db4 Remove __DATE__/__TIME__ from init and debuggerd
f429d37 Reorder init.rc to avoid a kernel warning.
42a981d healthd: Adds fake battery properties for devices with no battery.
9e65f94 add system-background cpuset
751dfdd Don't show UI on default encryption
17b314f Add zygote to the foreground cpuset.
88dd713 Revert "Change init sequence to support file level encryption"

project system/extras/
83eeed9 emmc test: fix counter overflow
ec1457f 64bit emmc fix
dafe707 64bit emmc fix
0e115db Actually encrypt stuff
8723dd3 Don't encrypt lost+found

project system/keymaster/
39ba76d Return correct error from keymaster0engine for large RSA input

project system/media/
dce0eca fix usb audio for devices with more than 8 channels

project system/security/
1f76969 Limit maximum number of concurrent keystore operations.
410ba59 Fix failure to save master key on new profile

project system/vold/
2403b4d Promote free bytes calculation to 64 bits
89f74fb Kill apps using storage through bind mounts.
dadccee Clean up any/all stale partition tables.
569649f Don't show UI on default encryption
af94f53 Offer debug flag to force default primary.
8fcc77a Report internal path for public volumes.