==================== 04-25-2016 ==================== * frameworks/av/ 1af28f1 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-13.0 * frameworks/base/ a8088af Fix derp 3d90e1b Merge pull request #20 from entony80/patch-4 9fa8637 Fix recents apps passing through the google search bar when visible bc3e60b [1/2] fwb: Add ability to permanently hide apps from recents 450ede9 HeadsUpTile: Open up Heads Up settings on longrpess (2/2) 0823b1f SystemUI: add HeadsUp snooze disabled state (1/2) 0ed49b1 SystemUI: HeadsUp toast message 80e73b7 Support for new properties to identify country based ecc #s added by RIL e9de61d LLS: Show notification panel if LLS crashes 6bf60e9 LLS: Fix screen off event firing when not interactive d21c697 libhwui: Remove opaque check for everything 296ae0f Keyguard: switch to cm-specific device provisioned flag a404b57 SettingsProvider : load region-specific settings * packages/apps/Settings/ c43b34c Merge pull request #45 from entony80/patch-15 46f7000 [2/2] Settings: Add ability to permanently hide apps from recents 06c164d HeadsUpTile: Open up Heads Up settings on longrpess (2/2) dd97f80 Settings: add HeadsUp snooze disabled state (2/2) 9b5fd94 Themes: Add tint mode so custom icons can show in power usage detail * packages/apps/SetupWizard/ c1fb3f2 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_SetupWizard into cm-13.0 * packages/services/Telephony/ d3cd55f Fix Lte Tile * system/bt/ 81f6e1d Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_bt into cm-13.0 87c9691 add medianav to unsupported device for hfp 1.7 * vendor/cm/ 40f5e6e Update Ambient SDK to 1.5.5 84de7bc sepolicy: Allow recovery to mount on tmpfs * vendor/cmsdk/ b5bd414 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/cm_platform_sdk into cm-13.0 e41c292 livedisplay: Fix three bugs fd3415a Merge branch 'cm-13.0' of https://github.com/CyanogenMod/cm_platform_sdk into cm-13.0 ==================== 04-24-2016 ==================== * external/stagefright-plugins/ d379af4 stagefright-plugins: Fix port reset problem * packages/apps/Dialer/ 6167f42 NPE: check that cn is null and return ==================== 04-23-2016 ==================== * external/stagefright-plugins/ 38e74de stagefright-plugins: Fix eos flush problem. * frameworks/av/ c27a16c audiopolicy: Fix notification not sent for session release * frameworks/opt/net/wifi/ eb9c90d Null check before accessing AP objects * hardware/qcom/fm/ d8a97a8 fmapp2: Allow value for the default fm recording duration to be overlayed. * hardware/ti/omap4/ c0ab422 camera: fix large tiler memory leakages * packages/apps/Messaging/ 22d92d6 Text/Multimedia message limit feature * packages/apps/SetupWizard/ fccccda SetupWizard: add a CM-specific setup-complete settings key * packages/services/Telecomm/ 1ee0b8d Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_services_Telecomm into cm-13.0 fb92b65 Telecom: refresh missed call notification on locale change * vendor/cmsdk/ bf5261c CMSettings: add CM_SETUP_WIZARD_COMPLETED key 7a4fed9 livedisplay: Always check for transition * vendor/cmsdk/samples/weatherproviderservice/ 6757ab6 WundergroundCM: Update iconography. ==================== 04-22-2016 ==================== * bionic/ be23231 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_bionic into cm-13.0 * build/ b9a4f9d Merge tag 'android-6.0.1_r30' into HEAD * external/libpng/ 08d66c9 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_external_libpng into cm-13.0 * external/sepolicy/ f6f16ff Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_external_sepolicy into cm-13.0 7043e03 adbd: allow "adb pull /sdcard/" * frameworks/av/ b054057 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-13.0 * frameworks/base/ 71d1988 Themes: Update icon mapping on boot d03f3fe Fix build e376bb6 SysUI: Make Battery Saver Tile VISIBLE to All Devices 21d7fe3 Merge tag 'android-6.0.1_r30' into HEAD c9c634c Lockscreen : Fix dead-zone in bottom area 48d871e Revert "Lockscreen : Ensure window bounds change after view animations" 0eb5ad0 Update Italian translation * frameworks/native/ 1f775c7 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_native into cm-13.0 * libcore/ 14269fe Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore into cm-13.0 * packages/apps/Bluetooth/ 646b429 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Bluetooth into cm-13.0 * packages/apps/Dialer/ 416100f Fix crash in Settings when clicking on Phone Number Lookup 9f9dfa5 Settings: Add back Accessibility 2366ded Improvements to Nudges 9e8223e Search: Show FAB in the right place fcd9f77 Quick search results: fix to match selected item in spinner * packages/apps/InCallUI/ f10d13b Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-13.0 b436d85 Revert and modify "Change in InCallAPI handover button UI" * packages/apps/Settings/ 390b6ad Merge tag 'android-6.0.1_r30' into HEAD f39779d Update Italian translation * packages/apps/Snap/ 1f7404e Snap: Add support for focus distance f9739a3 Revert "Snap: Improve focusing" * packages/providers/WeatherProvider/ ece43f8 Check for default WeatherInfo values * packages/services/Telecomm/ 328fa41 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_services_Telecomm into cm-13.0 * system/bt/ be48e15 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_bt into cm-13.0 * system/core/ 6de46fb Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_core into cm-13.0 * vendor/cm/ a032cd8 Update Ambient SDK to 1.5.3 * vendor/cmsdk/ b6d47b9 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/cm_platform_sdk into cm-13.0 b00c945 livedisplay: Bugfixes and cleanups 9adbc6f cmsdk: Ignore "samples" subdir. * vendor/cmsdk/samples/weatherproviderservice/ 6a231df WundergroundCM: Make sure to set the current days forecast. d7700c7 WundergroundCM: Update gradlewrapper version and only pull from mc. ==================== 04-21-2016 ==================== * frameworks/av/ 5fac306 Merge tag 'android-6.0.1_r30' into HEAD 32ef055 audiopolicy: Clean up the mess * frameworks/base/ c40781e SystemUI: fix some qs tile race conditions 5073ff2 Revert "SystemUI: fix some qs tile race conditions" * frameworks/native/ ec0faee sensorservice: fix an invalid format string 573fb3e sensorservice: add power usage to dumpsys * hardware/qcom/fm/ ee0b89e Route audio to connected A2DP headset on turn on. 2f5edee FM: Fix Static Analysis Issues 836e8dc Handle orientation change in FM app 220242c Fix null pointer exception in FMRadioService * packages/apps/Bluetooth/ 197747b Merge tag 'android-6.0.1_r30' into rebase_r30 * packages/apps/CarrierConfig/ 49b017a Import national-roaming settings from f/b * packages/apps/Dialer/ e8dc4e8 Add metrics event for selecting call method 93b791a Convert call log and call stats details to new contact blocking code. 5d89d62 Call Statistics: fix NPE on rotation * packages/apps/InCallUI/ 1ca5290 Make Block action contingent on system-wide Blacklist setting * packages/services/Telecomm/ c427d59 Merge tag 'android-6.0.1_r30' into HEAD * prebuilts/cmsdk/ 55dfb9c prebuilts/cmsdk: Update released artifact (overwritten). * vendor/cmsdk/ 36b7876 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/cm_platform_sdk into cm-13.0 ab3916f Add Weather API test coverage * vendor/cmsdk/samples/weatherproviderservice/ 5b049da WundergroundCM: Point at maven central for artifact. f24ccf6 WundergroundCM: Provide weathercondition to weathercode map. a6f49ab WundergroundCM: Add api key verification mechanism. ==================== 04-20-2016 ==================== * bionic/ 7d5a282 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_bionic into cm-13.0 b24ae58 Merge tag 'android-6.0.1_r30' into HEAD * build/ db9179b qcom: Use correct path for BT vendor f606a42 img_from_target_files: Skip oem.img in fastboot image creation 07b6b0a releasetools: Fix print in boot image signing cf66655 releasetools: Add bootable image signing ae9924c build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE" 709db20 build: Create a oem image when BOARD_OEMIMAGE_FILE_SYSTEM_TYPE is defined 6615944 build: Add BOOTIMAGE_EXTRA_DEPS for BOOT_SIGNER products too 2ad0361 build: Use compatibility DTB directory path for custom DTB tool builds * device/motorola/msm8226-common/ 4a6ba8d Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_device_motorola_msm8226-common into cm-13.0 * external/libpng/ 1d72d43 Merge tag 'android-6.0.1_r30' into HEAD * external/wpa_supplicant_8/ ae76c4b Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_external_wpa_supplicant_8 into cm-13.0 * frameworks/av/ bd2a0a8 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-13.0 * frameworks/base/ bb8a9fa SystemUI: Fix Statusbar Clock font size/color on location changes 1e77fd8 SystemUI: Fix always "Charging Slowly" indication eb7dc0f Global actions: fix airplane mode switch for MSIM 47f3937 Lockscreen : Ensure window bounds change after view animations 098e785 SystemUI: don't crash with bad tiles 9afb38f SystemUI: Move ADB_ENABLED to "Global" 6f77c06 SystemUI: fix some qs tile race conditions 8b6d401 QSTiles: set disconnect callback in bluetooth details list adapter f611209 Automatic translation import 2bce7a1 SysUI: Fix reporting of swipe progess in notification panel 1c054c0 SettingsLib: Add back accidentally removed translations bf8be7e systemui: Remove LiveDisplay tile 25d8605 LockPatternUtils: Use the actual user id to set pattern size 807b177 LockSettingsStorage: migrate user pattern size to correct userid d1bc9ea LockSettingsStorage: fallback to cm legacy gesture file 8bb73ee SettingsProvider: move SYSTEM_PROFILES_ENABLED to CMSettings 463d815 Lockscreen : Update shortcuts in onAttachWindow 5f60ec9 Lockscreen : Ensure we hide bottom area in bouncer 1016274 Race in WapPushManager under multi-thread environment 8ad0d58 Correct MediaAudioTrackTest testPlaybackHeadPositionAfterStop ce69e97 packagemanager: Fix bootloop if packages.xml is deleted 803a876 Themes: Restore original value if getValue fails 85c27d4 Check for deprecated third party keyguard perm 8765856 livedisplay: Moving LiveDisplay to CMSDK 72e9e20 GlobalActions: Always use setZenMode aabcb14 SysUI: Deprecate collapseNotificationPanel [2/2] 030a50b SystemUI: fix double tap power launching custom lockscreen icon 8ea4845 SystemUI: remove extraneous debug log 9175b50 SystemUI: add closed all tasks event log 837f61f SystemUI: add RecentsView EventLogs * frameworks/native/ 0750638 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_native into cm-13.0 * frameworks/opt/hardware/ 39638c0 cmhw: Fix DisplayColorCalibration GPU-mode issues * frameworks/opt/net/wifi/ 4f30b20 Merge tag 'android-6.0.1_r30' into HEAD 19c42df Revert "WiFi not connecting to WiFi when screen OFF" * hardware/libhardware/ 146a870 Merge tag 'android-6.0.1_r30' into HEAD * hardware/qcom/audio/default/ 526cf00 post_proc: Misc cleanups 6131d95 post_proc: improve logging 410cbfb post_proc: Fix bassboost/virtualizer not disabled on speaker db738c0 volume_listener: Silence volume listener log 948d7df post_proc: fix inconsistency in virtualizer state from set_strength call * packages/apps/Bluetooth/ 87c2095 Merge commit 'a71eb120c7390a82474bf8bdb94d08e723582f9f' into HEAD bd13d73 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Bluetooth into cm-13.0 * packages/apps/BluetoothExt/ ff03ed7 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Bluetoothext into cm-13.0 * packages/apps/Browser/ 56ca512 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Browser into cm-13.0 * packages/apps/CertInstaller/ d523272 Merge tag 'android-6.0.1_r30' into HEAD * packages/apps/InCallUI/ be726b5 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-13.0 * packages/apps/Messaging/ 98df70d Messaging: Read Report != Delivery Report. 1fd9824 Messaging: Fix mms expiry preferences. * packages/apps/OmniSwitch/ 03502ed Merge branch 'android-6.0' of https://github.com/omnirom/android_packages_apps_OmniSwitch into cm-13.0 * packages/apps/PackageInstaller/ 18a7202 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_PackageInstaller into cm-13.0 * packages/apps/Settings/ 4828455 Show the option for 'Show running apps' for AOSP recents as well d7f0684 Settings: Move ADB_ENABLED to "Global" e5265ec Settings: Save vibration intensity on close 3fcbe65 Settings: Rework vibration intensity slider 989e5a8 Automatic translation import c5d1005 Prevent crash if weather settings activity can't be found 1489480 Settings: check current ringtone for non-default sub ids b7cba3c Restore double tap to wake string from CM 12.1. 61da45c Fix unavailable wifi icon in wifi priorities 6bf7f95 Settings: use the actual user id to set pattern size 24cd49a Setting: Disable WPS Push Button/Pin Entry when WiFi is disabled a6075e5 SpamList: Set correct color & remove text from notifications menu item df53185 livedisplay: Update Settings for new LiveDisplay API * packages/apps/SetupWizard/ 5c02c44 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_SetupWizard into cm-13.0 * packages/apps/ThemeChooser/ ed79382 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_ThemeChooser into cm-13.0 * packages/providers/MediaProvider/ 94200a6 Merge branch 'cm-13.0' of https://github.com/CyanPop/android_packages_providers_MediaProvider into cm-13.0 2d907b7 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_providers_MediaProvider into cm-13.0 * packages/services/Telecomm/ 7c35714 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_services_Telecomm into cm-13.0 9c02764 Incorrect cache key in ConnectionServiceRepository 48aca57 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_services_Telecomm into cm-13.0 * system/bt/ 5320f7c Merge tag 'android-6.0.1_r30' into HEAD 70a5d02 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_bt into cm-13.0 * system/core/ 9caf67b Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_core into cm-13.0 * vendor/cm/ b61180c 6.4 0b3124f MetroPCS APN update 71574b4 Irancell & MTS APN updates 4bc29ad cm: Amend api text message. 5b97d7e Update APN name for Movistar INTERNET 3a5de2a APN: fixup single-digit mnc APNs 4ebdd21 cm: Moving LiveDisplay to CMSDK 88f3729 SMART [PH] APN updates 8f21ac8 cm: Support maven artifact as aar for publish. * vendor/cmsdk/ 9a68e0c Merge branch 'cm-13.0' of https://github.com/CyanogenMod/cm_platform_sdk into cm-13.0 02a71cc Weather API: Honor the values set for today's low/high temp * vendor/motorola/ 077ae71 Merge branch 'cm-13.0' of https://github.com/TheMuppets/proprietary_vendor_motorola into cm-13.0 ==================== 04-19-2016 ==================== * bootable/recovery/ 862a8e1 Merge tag 'android-6.0.1_r30' into HEAD * cts/ 8885fe0 merge in marshmallow-cts-release history after reset to marshmallow-cts-dev 350f727 Merge "DO NOT MERGE: Fix build break" into marshmallow-cts-release f010e48 DO NOT MERGE: Fix build break 28f8693 Merge "Revert "Obtain min frame rate from codec capabilities"" into marshmallow-cts-release 8b47757 Revert "Obtain min frame rate from codec capabilities" e216dd8 Merge "DO NOT MERGE: Set priority for notification in a11y cts test." into marshmallow-cts-release 9789389 DO NOT MERGE: Set priority for notification in a11y cts test. 3cb6630 Merge "DO NOT MERGE: Disabling sensor tests and policy permission" into marshmallow-cts-release eae5dc9 DO NOT MERGE: Disabling sensor tests and policy permission * external/bouncycastle/ ac1940f Merge tag 'android-6.0.1_r30' into HEAD * external/dhcpcd/ 49aad12 Merge tag 'android-6.0.1_r30' into HEAD * external/icu/ ea50f14 Merge tag 'android-6.0.1_r30' into HEAD * external/libavc/ 5f7a7a9 Merge tag 'android-6.0.1_r30' into HEAD * external/pdfium/ 8f8b2f2 Merge tag 'android-6.0.1_r30' into HEAD * external/sepolicy/ f00429d Merge tag 'android-6.0.1_r30' into HEAD * external/skia/ b0dba5e Merge tag 'android-6.0.1_r30' into HEAD * external/sonivox/ bba9df6 Merge tag 'android-6.0.1_r30' into HEAD * external/wpa_supplicant_8/ b5ff4de wpa_supplicant: Force the p2p channels to reuse frequencies used by STA * frameworks/minikin/ dfeadad Merge tag 'android-6.0.1_r30' into HEAD * frameworks/native/ 74e887c Merge tag 'android-6.0.1_r30' into HEAD * hardware/qcom/audio-caf/msm8974/ f15ad14 post_proc: fix inconsistency in virtualizer state from set_strength call * libcore/ 45b2d5a Merge tag 'android-6.0.1_r30' into HEAD * packages/apps/Dialer/ 581e03b Dialer NPE - Search Results * packages/apps/Exchange/ 444e35e Merge tag 'android-6.0.1_r30' into HEAD * packages/apps/Messaging/ 1fd9824 Messaging: Fix mms expiry preferences. 97897a5 Messaging: Reference the nontranslatable key instead of hardcoding value. * packages/apps/SetupWizard/ e5c2b92 Prefer SIM carrier name over network carrier * packages/apps/Snap/ c1945c8 Snap: Add missing return for SET_ONESHOT_PREVIEW_CALLBACK case * packages/apps/ThemeChooser/ 1f5c627 ThemeChooser: update UI * packages/apps/Trebuchet/ bd7c086 Trebuchet: sign when not building with test keys * packages/apps/UnifiedEmail/ c31f580 Merge tag 'android-6.0.1_r30' into HEAD * packages/providers/ContactsProvider/ aa49b77 Merge tag 'android-6.0.1_r30' into HEAD * packages/providers/DownloadProvider/ bee7b77 Merge tag 'android-6.0.1_r30' into HEAD * packages/screensavers/Basic/ 76d7a60 Update THIRD_PARTY_KEYGUARD perm name * packages/services/Mms/ ff77069 MmsRequest: Turn on data for the MMS transaction if required * packages/services/Telephony/ 9070be1 Merge tag 'android-6.0.1_r30' into HEAD * system/core/ cba3c2b Merge tag 'android-6.0.1_r30' into HEAD * vendor/cmsdk/ 18aa2f5 cmsdk: Fix definition of live display tile, as its now dynamic. * vendor/cmsdk/samples/weatherproviderservice/ 2a77ad4 WundergroundCM: Provide attribution and do clean up. 2c397d7 WundergroundCM: Add settings activity. ==================== 04-18-2016 ==================== * cts/ 7ff3492 Merge "Merge "DO NOT MERGE: fixed breakage" into lollipop-mr1-cts-dev am: 90cb6ab -s ours" into marshmallow-cts-dev 7539c53 Merge "DO NOT MERGE: fixed breakage" into lollipop-mr1-cts-dev am: 90cb6ab -s ours 90cb6ab Merge "DO NOT MERGE: fixed breakage" into lollipop-mr1-cts-dev 93d35b3 DO NOT MERGE: fixed breakage bf05959 Merge "DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout." into marshmallow-cts-release c21273b DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout. 0fdea94 Merge "DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout." into marshmallow-cts-dev 23630f2 DO NOT MERGE: Fix the profile-wifi-cleanup test by increasing the timeout. a15c5e5 Merge "Merge "Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423 -s ours" into lollipop-mr1-cts-dev am: b2ea49c -s ours" into marshmallow-cts-dev e38e459 Merge "Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423 -s ours" into lollipop-mr1-cts-dev am: b2ea49c -s ours b2ea49c Merge "Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423 -s ours" into lollipop-mr1-cts-dev 83985c5 Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423 -s ours f0f6423 Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev 858f8a7 DO NOT MERGE: Disable CVE 2015_3826 test 9de3bf0 Merge "Merge "DO NOT MERGE: Remove testDumpProtected" into lollipop-mr1-cts-dev am: 2d09388 -s ours" into marshmallow-cts-dev 07c57f7 Merge "DO NOT MERGE: Remove testDumpProtected" into lollipop-mr1-cts-dev am: 2d09388 -s ours 2d09388 Merge "DO NOT MERGE: Remove testDumpProtected" into lollipop-mr1-cts-dev b059e04 DO NOT MERGE: Remove testDumpProtected 71f7503 Merge "Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6" into lollipop-cts-dev am: 4120120 -s ours" into lollipop-mr1-cts-dev am: e72f770 -s ours" into marshmallow-cts-dev d6febfd Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6" into lollipop-cts-dev am: 4120120 -s ours" into lollipop-mr1-cts-dev am: e72f770 -s ours e72f770 Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6" into lollipop-cts-dev am: 4120120 -s ours" into lollipop-mr1-cts-dev ee5f83a Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-dev am: 0d37ebf -s ours" into marshmallow-cts-dev 0b76577 Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-dev am: 0d37ebf -s ours ea481a2 Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6" into lollipop-cts-dev am: 4120120 -s ours 5d36699 Merge "DO NOT MERGE ANYWHERE: Bump CTS 6.0 to R6" into marshmallow-cts-release c7b2f8d DO NOT MERGE ANYWHERE: Bump CTS 6.0 to R6 9a0b673 Merge "DO NOT MERGE ANYWHERE: Bump CTS 6.0 to R6" into marshmallow-cts-dev c0c6f0b DO NOT MERGE ANYWHERE: Bump CTS 6.0 to R6 4120120 Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6" into lollipop-cts-dev c062132 DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R6 0d37ebf Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-dev b27454c DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7 f9aec46 merge in marshmallow-cts-release history after reset to marshmallow-cts-dev * packages/apps/AudioFX/ 73f209a Merge "audiofx: Ignore session callbacks if recording in progress" into cm-13.0 * packages/apps/Eleven/ 1b3cbd3 Merge "CodeCleanup : Replace StringBuffer with String" into cm-13.0 7d14986 Eleven: vertically recentre widgets * packages/apps/LockClock/ 8af8dab Display humidity and wind data in forecast dialog * packages/services/Mms/ b7a3f51 MmsRequest: Switch data subscription on MSIM if needed ==================== 04-17-2016 ==================== * device/motorola/msm8226-common/ b8c93c7 Automatic translation import * frameworks/av/ 489c9fb audiopolicy: Update legacy policy for session callbacks * frameworks/opt/hardware/ d3ceb18 cmhw: Fix return value * hardware/qcom/fm/ c5fd4ca Automatic translation import * packages/apps/AudioFX/ 3819af8 Automatic translation import 8bc1539 audiofx: Ignore session callbacks if recording in progress * packages/apps/BasicSmsReceiver/ 4176108 Automatic translation import * packages/apps/Bluetooth/ 1e3c122 Automatic translation import * packages/apps/BluetoothExt/ a388570 Automatic translation import * packages/apps/Browser/ 0c11751 Automatic translation import * packages/apps/CMFileManager/ e56b31d Automatic translation import * packages/apps/CMWallpapers/ adbdb6d Automatic translation import * packages/apps/Calendar/ 4dfd7b8 Automatic translation import * packages/apps/Camera2/ 14475d3 Automatic translation import * packages/apps/CellBroadcastReceiver/ d0ca767 Automatic translation import * packages/apps/CertInstaller/ 18e746b Automatic translation import * packages/apps/Contacts/ 68cf084 Automatic translation import * packages/apps/ContactsCommon/ 398374a Automatic translation import * packages/apps/DeskClock/ 2fe4738 Automatic translation import * packages/apps/Dialer/ 3fb7eeb Automatic translation import * packages/apps/Eleven/ c288989 Merge "Automatic translation import" into cm-13.0 36a2a5b CodeCleanup : Replace StringBuffer with String 824ef07 Eleven: Simplify a boolean expression 16ae2d4 Automatic translation import * packages/apps/Email/ 38662a1 Automatic translation import * packages/apps/ExactCalculator/ 1e78c7d Automatic translation import * packages/apps/Exchange/ b006750 Automatic translation import * packages/apps/FMRadio/ d9054a9 Automatic translation import * packages/apps/Gallery2/ 32f8e21 Automatic translation import * packages/apps/HTMLViewer/ 46cdabd Automatic translation import * packages/apps/InCallUI/ ed656a4 Automatic translation import * packages/apps/KeyChain/ 7958df8 Automatic translation import * packages/apps/LockClock/ ed98ad9 Automatic translation import * packages/apps/ManagedProvisioning/ 5cbbaaa Automatic translation import * packages/apps/Messaging/ aa7672b Automatic translation import * packages/apps/Nfc/ d63f166 Automatic translation import * packages/apps/PackageInstaller/ 0980d67 Automatic translation import * packages/apps/PhoneCommon/ b2f6222 Automatic translation import * packages/apps/Profiles/ 09ee22c Automatic translation import * packages/apps/Screencast/ 828959e Screencast: material makeover f5a3cb0 Automatic translation import * packages/apps/SetupWizard/ 4082d3a Automatic translation import * packages/apps/Snap/ 437d36c Automatic translation import * packages/apps/SoundRecorder/ 1a6ccbf Automatic translation import * packages/apps/Stk/ bb75646 Automatic translation import * packages/apps/Tag/ 48a4e08 Automatic translation import * packages/apps/Terminal/ 39644b9 Automatic translation import * packages/apps/ThemeChooser/ df0a366 Automatic translation import * packages/apps/Trebuchet/ 8c11bd8 Automatic translation import * packages/apps/TvSettings/ 9bf8494 Automatic translation import * packages/apps/UnifiedEmail/ 30a1786 Automatic translation import * packages/inputmethods/LatinIME/ 9b7f198 Automatic translation import * packages/providers/BookmarkProvider/ cb9b55f Automatic translation import * packages/providers/CalendarProvider/ 9fd7d2a Automatic translation import * packages/providers/CallLogProvider/ 4eba5f5 Automatic translation import * packages/providers/ContactsProvider/ b496a82 Automatic translation import * packages/providers/DownloadProvider/ a60bcb8 Automatic translation import * packages/providers/MediaProvider/ c8dacd0 Automatic translation import * packages/providers/TelephonyProvider/ 59816d3 Automatic translation import * packages/providers/ThemesProvider/ 66df087 Automatic translation import * packages/providers/UserDictionaryProvider/ 7057644 Automatic translation import * packages/providers/WeatherProvider/ 0a7e4bb Automatic translation import * packages/screensavers/Basic/ 6f8df69 Automatic translation import * packages/screensavers/PhotoTable/ 201f8a7 Automatic translation import * packages/services/LiveLockScreenService/ 7bc0493 Automatic translation import * packages/services/Mms/ c642b5a Automatic translation import * packages/services/Telecomm/ 302e70c Automatic translation import * packages/services/Telephony/ a777be0 Automatic translation import * packages/wallpapers/Basic/ 33e4596 Automatic translation import * packages/wallpapers/Galaxy4/ 8c158af Automatic translation import * packages/wallpapers/LivePicker/ c418d68 Automatic translation import * packages/wallpapers/MagicSmoke/ a0ae211 Automatic translation import * packages/wallpapers/PhaseBeam/ e0e6749 Automatic translation import * packages/wallpapers/PhotoPhase/ 343b3d3 Automatic translation import * system/core/ f5eb730 healthd: Fix NO_CHARGER_LED * vendor/cmsdk/ 380d31c Automatic translation import 3944915 livedisplay: Fix validator for the nudge counter ==================== 04-16-2016 ==================== * external/wpa_supplicant_8/ 9fda75c wpa_supplicant_conf: Let devices provide their own template * frameworks/av/ c38d4f2 frameworks/av: Fix video recording breaks * frameworks/opt/hardware/ 35568c6 cmhw: Move DisplayColorCalibration from hardware/cyanogen to here * hardware/cyanogen/ 240b860 cmhw: Remove DisplayColorCalibration from hardware/cyanogen * packages/apps/Contacts/ affff68 [2/2] Add new method for determining whether to show block option dd2acf1 Make Block action contingent on system-wide Blacklist setting * packages/apps/ContactsCommon/ 0e6d8d4 [1/2] Add new method for determining whether to show block option * packages/apps/Dialer/ 6685f01 Dialer: Handle OEM Specific codes. 114b9b5 Expand clickable area of settings button 7c88b51 Search: Only clear focus if we are showing a coachmark 749d5f8 [1/2] Use UICommon simple SnackBar * packages/apps/Eleven/ 120fc6d Eleven: much material * packages/apps/Messaging/ d9a5a83 Messaging: Fix broken and untested features. * packages/apps/OmniSwitch/ 561495c OmniSwitch: we now need a layout-land for the drag handle config * packages/providers/ThemesProvider/ 9063435 New icon * system/bt/ bdcf617 bt-vendor: Fix sporadic crashes on shutdown * system/core/ 74f658f healthd: Allow devices to opt-out of enabling charger LED 05a3648 healthd: Rename default QCOM libhealthd library * vendor/cmsdk/ b62448a Revert "CmSdk : Add deprecated THIRD_PARTY_KEYGUARD permission" 0918427 CmSdk : Add deprecated THIRD_PARTY_KEYGUARD permission e554528 livedisplay: Update system-api 842344a livedisplay: Fix endless loop for devices that don't support outdoor mode. 7cd7f79 livedisplay: Fix bad state after bootup 0ec60c6 livedisplay: Don't explode if no modes are available 712426f livedisplay: Publish our own damn tile! 763e39a livedisplay: Fix error checks when fetching config