[ONE Android Development] Setting.Out:
Change log...

====================

03-16-2016

====================

* external/dhcpcd/

8340b25 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_external_dhcpcd into HEAD

* external/sepolicy/

0fa3aed Merge branch 'cm-13.0' of github.com:CyanogenMod/android_external_sepolicy into HEAD

* external/stagefright-plugins/

ed03eec Revert "stagefright-plugins: Protect against crash"

* external/zlib/

df42d71 zlib: crc optimization for arm64

* frameworks/base/

71a8d41 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_base into cm-13.0

c1fcac6 fw: Move externalCMServices declaration to external res package.

* frameworks/opt/telephony/

4131a3b Add TD-SCDMA support

* kernel/moto/shamu/

a00f400 Merge remote-tracking branch 'aosp/android-msm-shamu-3.10-marshmallow-mr1' into cm-13.0

* packages/apps/Settings/

cba6cc5 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_packages_apps_Settings into cm-13.0

3a85ba8 Settings: ask telephony for network selection

* packages/apps/Trebuchet/

0991d31 Trebuchet: Fix some issues with the DB upgrade path

772f61d Show apps as unavailable when on unmounted storage

* packages/services/Telephony/

da57833 Telephony: add external network selection activity

* prebuilts/cmsdk/

d97eb01 prebuilts/cmsdk: Update for snapshot maven release.

* system/core/

7b15196 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_system_core into cm-13.0

fb7e634 liblog: build log_event_write regardless of TARGET_USES_LOGD

* vendor/cm/

01ebfe0 Remove SnapDragon

2399529 Never cherry-pick on your phone...

0798c8f config: BasicDreams

1074ff3 Disable CyanogenMod Setup This is anoying option as doesn't let users to automatically install apps after setup. Disable for now.

35b56f4 Update SuperSU2.67

ac279d1 Add SuperSU 2.66

a460871 Allow init on user builds

32220f4 Mistake on cherry-pick

b100ebf Set persist.sys.root_access=3

d2eef96 Revert "Add SuperSU 2.52"

e7e0df0 Revert "SuperSU: Update to 2.66"

3dd52c7 Revert "CM Snapdragon camera needs work"

e6ad155 CM Snapdragon camera needs work

1950235 Remove filters for user builds to have access to same features

8257051 SuperSU: Update to 2.66

3960b88 Add Snapdragon Camera

acb0ddc Add SuperSU 2.52

020b712 not needed

d645104 Vendor: Changelog (2/3)

78ea546 Add changelog generator (1/2)

d5124dc Marshmallow boot animation

d5f0c0a Odex+other configs

adf53e6 common: Added name of builder

f3610f5 cm: Commonize cmsdk specific targets.

649c832 cm: Remove externalCMServices overlay. (in cmsdk)

8f239ee Add Z00L maintainers

* vendor/cmsdk/

c46e0ff cmsdk: send connection value when changing network modes

80f5651 cmsdk: Introduce externalCMServices array to cmres.

a335ba3 cmsdk: Mandate cmhw feature xml's for service implementation.

====================

03-15-2016

====================

* bootable/recovery/

b7fb185 recovery: Only set relevant sysbar state flags

* build/

06b51a9 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_build into fast

cbf9692 envsetup: fix mm under zsh

* external/stagefright-plugins/

c32061c stagefright-plugins: Fix memory leak

c39d091 stagefright-plugins: Fix memory leak

b8759d0 stagefright-plugins: Fix memory leak

* frameworks/base/

8ec9c0a Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_base into cm-13.0

f5994c8 Prompt permission dialog for status bar weather

6b5c6f3 Move keyDisabled and gamma to service

742dd1f Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_base into cm-13.0

9552ddc SystemUI: Always unset seperate roaming indicator.

f9a9d50 InputMethodManager : Move registration to systemReady

cf08385 Should use scan flag, or it will not scan device.

ae032eb SystemUI: Change demo mode time of day.

a777a9a GlobalActions: Set the initial status of airplane mode toggle

* frameworks/opt/hardware/

232ae82 hardware: make sure to declare hardware as feature.

* frameworks/opt/telephony/

d414390 MSIM: RJIL primary card feature

96c5861 Telephony: Don't show as roaming if new state isn't in service.

* frameworks/support/

c12213c Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_support into cm-13.0

* hardware/qcom/audio-caf/msm8974/

0d2d286 Force voice path when recording audio during call

* libcore/

86d5c96 Implemented ceil and floor in StrictMath

7716f65 Fix libcore.java.sql.OldPreparedStatementTest#testExecuteQuery

b10a3bf java/security: remove system.scope from security.properties

6b697b7 Fix multi-thread problem in BigInteger hashCode method

9bed375 Cache AbstractStringBuilder.toString() for better performance

333c251 Enum: Fix potential deadlocks caused by BasicLruCache usage.

c874e32 [1/4] JDK8: Do explicit cast of EnumMapIterator.next() return value

* packages/apps/DeskClock/

40c215c Use AppCompat\'s imageButtonStyle attribute am: 3003b28b22

* packages/apps/LockClock/

fde0e1e LockClock : Add external facing permission grant activity

* packages/apps/Settings/

ee1cfae Merge branch 'cm-13.0' of github.com:CyanogenMod/android_packages_apps_Settings into cm-13.0

9c35338 Settings : Add multiuser support for CMHardware

* packages/providers/ThemesProvider/

1a5f882 Use correct read/write perms for provider

* packages/services/Telecomm/

939d1cd Telecomm: Add support to set ring tone for SIM2

* prebuilts/gcc/linux-x86/aarch64/aarch64-linux-eabi-4.9/

c118aac init

* prebuilts/gcc/linux-x86/arm/arm-eabi-4.9/

4d1395b init

* system/core/

7ef9443 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_system_core into cm-13.0

* vendor/cm/

cf03e16 Bring back Exchange2

* vendor/cmsdk/

19b267d Revert "cmhw: Don't hold a static reference to the service"

220ab79 CMSettings : Add display gamma setting

* vendor/oneplus/

6873d21 Merge pull request #21 from ashwinr64/cm-13.0

====================

03-14-2016

====================

* art/

c584f60 Fix bogus logging statement.

ea85163 Fix 030-bad-finalizer & 059-finalizer-throw.

b154b66 Partially fix 046-reflect.

4a43ca4 Fix 137-cfi.

88d2212 Fix 055-enum-performance.

85cb231 Fix bug with test 964.

7d12ff8 ART: Update run-test 100

b4f043b ART: Fix PACKED size of tls_ptr_size.

982fbd1 Add missing null check to String::ToCharArray

* bionic/

3ea0d7f Remove gnu99

cd63235 Explicit binary op order for both gcc and clang/llvm.

ee8e3bc Fix select failures when STDIN is ready.

4b4f7a6 linker: mark library .bss pages with anon:.bss

df06f75 Revert "memcmp.S: ensure that the of cache is 32bytes"

26cb20e Sync with upstream OpenBSD.

7df09bc memcmp.S: ensure that the of cache is 32bytes Our device bacon uses has 32byte of cache alignment, so we'll ensure that it'll be kept the same. At same time remove neon filters to avoid any GCC missconfusion, this should not be necessary, but since I only build for bacon i prefer this way.

dc87ee2 Revert "Import memchr implementation from cortex-strings for Cortex A15"

cf90294 Import memchr implementation from cortex-strings for Cortex A15

f254d19 Revert "Speed-up ARM memcmp by leveraging NEON."

7113363 Correct way of defining benchmark

abae48f benchmarks: Add strchr benchmark.

365f258 benchmarks: Add memchr/memrchr benchmarks.

9f848c9 benchmarks: Add strrchr benchmark.

e30fba4 libc: Avoid building some extra debug stuff.

20125a1 including malloc_benchmark and calculate benchmarks more precisely.

15cb5a1 Speed-up ARM memcmp by leveraging NEON.

47798a8 Define char16_t and char32_t to make gcc 5.1 happy

* build/

5341de3 Revert "give the possibility to compress the ramdisk with lz4 algorithm"

ba83b8a Revert "LZ4 compability"

a0df4c0 Revert "set speed"

95b3c09 cf1b9acRevert "lz4: best value to use compression"

1a258ae build: releasetools: Support transparent compression

0ffbaaa lz4: best value to use compression

99e19c1 set speed

16427e9 LZ4 compability

d953640 give the possibility to compress the ramdisk with lz4 algorithm

0c07a04 cflags: speeed

fd30712 Revert "build: Always run checkapi when building system image"

f54f610 Revert "build: Enforce checkapi-cm on system image gen."

e84606a Revert "prebuild: compress shared libraries in prebundled apks"

6fcf484 Revert "Proguard: Adding new configs"

49585e9 Ensure we use this art set

1fae8c5 turn off for now

ee6f140 New optimizations configuration set

fd541e4 Proguard: Adding new configs

6bf3835 build configs

196ba01 proguard: lets try SDK flags

552b25c Do not run zipalign when building APK (except prebuilts).

9696850 Make signapk align .so entries to 4096 bytes.

30d2998 Clean up compiler warnings in signapk.

fdf518d Java 8 compability

b7a9c3d Add busybox and static busybox

23bfad5 SuperSU script: fix

46dfd8e Revert "DragonTC and Polly support Test 2"

de380e1 Revert "google recomended"

b3f051f Revert "DragonTC and Polly support Test 8"

a6f764a DragonTC and Polly support Test 8

516abbf google recomended

058f636 DragonTC and Polly support Test 2

6e4e879 Java 8 compability

c9015e9 jar: disable compression on jar and zip files to improve runtime performance

ae8738b Less debug on user builds

05469ff SuperSu Script

80ea1c5 Revert "Optimization: Compile with hard mfloat armv7-a-neon and build."

ae75800 Optimization: Compile with hard mfloat armv7-a-neon and build.

c9bd1c9 User builds are not for debug but will have access to debug tools

2cc1055 Remove g

074748e Revert "SuperSu Script"

896920f extra debug only for eng builds

124ad13 only for eng builds

41051c4 Revert "Clang 3.7.1"

29b90b7 Clang 3.7.1

10e724e Revert "Inhibit implicit -Bsymolic in -shared."

0e82b29 kernel: compile with gcc 4.9

8faf5e3 SuperSu Script

30c1b83 Revert "Revert "WebView prebuilt""

70c90eb Revert "WebView prebuilt"

4029787 Revert "Add -mtune=cortex-a15 optimization to krait"

51ce19a Add -mtune=cortex-a15 optimization to krait

3bfe118 Revert "Use Google Nexus Audio Files [1/2]"

aee6890 lets build camera2

bc2fdb8 Build: Changelog (3/3)

d43a2fe build: Add support for DTS decoder

5337053 WebView prebuilt

bfbc34a Use Google Nexus Audio Files [1/2]

aa721ff Removed unecessary stuff

177e440 Create 0 compression ratio jar files

* device/oneplus/bacon/

eec3682 interactive: new config to rebalance

775b3ba interactive: more sensitive

f2ac952 Disable Thermal Core Control and speedup a little more interactive

f316385 interactive: Lets save energy and keep things smooth

aa7d874 bacon: acdb: add DevicePair for handset mic + stereo headphones

17fd4d0 Revert "bacon: acdb: add DevicePair for handset mic + stereo headphones"

bcb432e Disable for now

dcfaaf5 Boardconfig : lz4

56d6960 fstab: add compability with f2fs at system partition

f1abd73 Revert "Revert "Revert "Revert "bacon: Re-introduce old-modem hack""""

b37074b Revert "Revert "Revert "bacon: Re-introduce old-modem hack"""

1880b34 Revert "Remove symlinks for WCNSS"

310e944 Revert "Remove symlinks related to other firmwareparts"

9170723 bacon: enable Snap camera

916cc44 Remove symlinks related to other firmwareparts

99706a9 wpa_supplicant: Sync with hammerhead

4f0b43d Remove symlinks for WCNSS

899a52e Update WCNSS config Sync with sultanxda config

3aec036 bacon: Switch back to gpsonextra time server

c5b9eaa mediaserver: allow loading shared library with text relocation

9a4ccbd Add prandom compability

6b912da remove clang for now

f10ff66 bacon: Avoid scale down in write

646dbe0 msm8974: Remove TARGET_USES_C2D_COMPOSITION

48abe27 msm8974: Reduce bitrate for 1080p video

83fb59f frandom support

6d14170 GCC prefix for kernel toolchain

a22fc09 Boardconfig:Set permissive

dd8a2ec bacon: Increase earphone speaker volume

d47a3fd bacon: Remove debugfs mounting

* frameworks/av/

1766660 Don't place large objects on the stack

292a7e7 DO NOT MERGE ANYWHERE Change Smaug volume curve

04486ec Fix warning: list conflicting ids (not cameraId)

a0b3d18 AudioFlinger: Increase shared heap size to 8MB

ab32260 audioflinger: clear mMixerBuffer if frame is not ready

aa057da stagefright: render video buffers

005dd74 SoftAVCEnc: Modified the code for runtime change in params to be generic

73cc853 MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow.

8e07ea2 Overflow fixes for amrwbenc

f8f1563 libcameraservice: Allow media server to disconnect camera even unlocked

59c59e8 Fix WaveGenerator memory leak

46caee8 Debug only on Eng builds

492a84a libmedia: Add 1440p camcorder quality

2848fd0 typo

3f70eff af/ar: Change Speex resampler quality level to 5.

a5a26e1 af/as: Add resampler using Speex library.

* frameworks/base/

ea229d4 fix metrics density comparisons

* frameworks/native/

a790cb1 Tune dex2oat

159adbd Tuning compiler thread count for optimal application install times

70ee46b Use 3gb dalvik heap and hwui

* hardware/intel/img/hwcomposer/

2248deb intel: hwcomposer: Only use DRM_PSB_PM_SET if it exists

* packages/apps/Settings/

2889289 Live Volume Steps [2/2]

6c8c7c1 Enable MultiWindow for everyone! :)

32b0828 fix out of memory with continuous entry and exit InstalledAppDetail.

64a5b24 Return: Smart Pulldown [2/2]

9659467 User builds always get root

192a334 Revert "Launch SuperSU from Settings"

a1d9266 user builds have access to root

d7cad5f Settings: Network traffic indicator

0fc0b4d Typo: remove parentesis

bff4dff Add statusbar notification category in Statusbar settings

e99c03d Settings: Changelog (1/3)

b7694e0 Disable Immersive Messages [2/2]

fab0a35 Force Expanded Notifications (2/2)

e5eee56 Developer options by default are set on user builds

7ecd927 Allow disabling of FC dialogs [2/2]

8d0f4d8 Enable Developer options by default

3051563 Battery saver: Add 10% and expand options up to 30%

d876aca Launch SuperSU from Settings

* packages/services/Telephony/

e2d5520 Fix "Fix "multi-sim: fallback on active subId on emergency calls""

* system/core/

586940a logd: unaligned access on security buffer

f10c98b Implement ZipWriter for quickly writing ZipFiles.

4c8ff07 libaudit: limit to 5 selinux denials per sec

1dafdc4 Allow disable SElinux on user builds

4d437e4 init: Fix derp in property name for rebooting to charger hook

* vendor/oneplus/

cd0173e onyx: Update Blobs

====================

03-13-2016

====================

* android/

c7718ad cm: Change external/pdfium to CM

ee17c6d cm: Update to 6.0.1_r22

* external/proguard/

581c823 upgrade to proguard

* frameworks/av/

50c27ea Merge branch 'dr15' into cm-13.0

* frameworks/base/

d11b80f Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_base into cm-13.0

7f6a0c2 Merge branch 'dr15' into cm-13.0

* frameworks/native/

65a4c0c vds: Allocate Framebuffer target buffer

a9cbaf5 SurfaceFlinger: Add support for continuous dumpsys to file.

* frameworks/opt/telephony/

69df2a9 Merge branch 'dr15' into cm-13.0

* kernel/google/msm/

24c7a1a tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)

7761828 KEYS: Fix race between read and revoke

* packages/apps/Trebuchet/

1129f55 Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Launcher3 into HEAD

* packages/providers/ContactsProvider/

832a3d6 Merge branch 'dr15' into cm-13.0

* packages/services/Telephony/

82b47ca Merge branch 'dr15' into cm-13.0

* prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/

b593bdf init

* system/core/

5839222 Merge branch 'dr15' into cm-13.0

3cc2ca8 init: Add a hook to turn a shutdown into a reboot

a41177e init: Add property_get_bool

* vendor/cmsdk/

96cfc73 cmhw: Don't hold a static reference to the service

* vendor/lge/

78ad063 g3: remove sensor_def_variable from all by d855

* vendor/motorola/

1db246f Merge pull request #233 from GalaticStryder/cm-13.0

====================

03-12-2016

====================

* bootable/recovery/

bc9052a Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/bootable/recovery into cm-13.0

* build/

771fead Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/build into cm-13.0

* device/huawei/angler/

cb920f0 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_device_huawei_angler into HEAD

* device/moto/shamu/

2a88f84 shamu: Update fingerprint to MMB29V

abe2f90 Merge tag 'android-6.0.1_r22' into cm-13.0

2adeb8f Merge tag 'android-6.0.1_r16' into cm-13.0

* external/pdfium/

20ad4b0 PDFium: Silence warnings

* external/toybox/

b3103a7 toybox: Fix upstream version parsing

* frameworks/av/

46da121 nuplayer: Allow devices to force a flush when surface changes

* frameworks/base/

8bf25d6 Merge branch 'cm-13.0' of github.com:CyanogenMod/android_frameworks_base into cm-13.0

0e1dbed Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0

50fbc8e core: Add strings for hotswap configuration event.

45a7318 SystemUI : Fix navbar dpad key visibility

7348be7 Move high touch sensitivity and hovering to InputService

1292e86 Move VIBRATOR_INTENSITY to vibrator service

b7996b1 LiveDisplayController : Reload settings for current user

a148cf1 Revert "Release SQLite page cache as much as it can"

50a68f1 Live Volume Steps [1/2]

18c4238 Fix NFC tile disappearing randomly

31b384c Remove unsupported RS graphics API tests.

81b6ff0 Pimp multi-window

9cff6a7 Boot up optimization for phoneprocess

2074ce5 NullPointerException in UsbStorageActivity

d8a0c86 SystemUI needs the SET_WALLPAPER permission

b3c6cef Update cached buffers in async mode

23a739d Fix no LED indication for missed call when screen off

d4a4b19 Remove unnecessary sleep in ActivityThread

70a9603 Fix an apk icon animation corruption issue

0a3bb98 Fix NPE in JobServiceContext when closing job

49b050b Fix NPE in TextUtils

2b69e9c Handle IllegalStateException from Surface.lockCanvas

d057e7e Handle NPE due to threading race

ef4ee1a Fix ListView is not scrolled properly with arrows

a86cf75 Fragment animations are not being saved across configuration changes

e5294cd Fix the bug in replacing a fragment with itself

5a34bc5 Release SQLite page cache as much as it can

4f0bc7a Increase priority for broadcast intent triggered by HW key

c9121cb Sometimes property service is slow to respond.

5eced98 Do not scan a file which cannot be read

39dea40 Reduce the delay during headset removal

7752e7c Fix WallpaperCropper crash when setting wallpaper over 8MB

bc520aa ChooseTypeAndAccountActivity: Fix the NullPointerException

23fc517 Fix to NullPointerException when activity is relaunched

59f4870 Speed up UI

fc9c60d Update frameworks-res.apk icon to a more appropriate icon

9236e6a SystemUI: Remove xxxhdpi sysbar pngs

00ce84e SystemUI: Vectorify system bar drawables

15c2423 telephony: Handle NPE in setDataEnabledUsingSubId()

c49a9d4 Remove dead code

23e4071 quick pull down: missing parts

2bc8141 Avoid duplicate call to onLoadFinished()

fcdcd13 UsbdeviceManager: Avoid sending extra USB_STATE broadcast intent

5cac9fb Don't apply clang flag to gcc builds.

a53c44e Fix bugs : when user designate print range, NumberFormatException is occured.

7f0c0df Return only if both playback and capture not present

c13eb60 Framework changes for disabling per app metered network usage

e937f65 ImageReader: override the flexible YUV compatible formats

d2fc2a4 Camera2: Fix getInternalFormatSizes for depth

a5505f2 Avoid unregistering client while stopping LE Scan

bca59ec Fix NullPointerException in DhcpPacket.getTransactionId()

09928fc Fix for launching App from Recent Apps on first click

77590b0 Smart Pulldown [1/2]

b77de45 Java 8 in layoutlib-create

e68aad6 proguards : test flags

c451d79 Allow Python Versions Higher than 2.6

1d3f5e1 Delete Media Tests

e98b14d Purge Videos we don't need

31d534e Fix NPE in SyncRequest builder

2f60fef Remove infinity invalidation when both scrollbars are shown

4f4b02b Fix Activity.onConfigurationChanged may not be called.

9052c1d Make sure NaturalSurfaceLayout is consistent with SurfaceControl

83d161b Increase brightness faster if ambient light is brightening quickly.

3dfcf60 Base: Network speed indicator

3375b4f Allow faster app switching

c85ef9a SwipeHelper: Let's cut Max Excape Animation in Half too

67e1091 NullPointerException when starting VoiceInteractionManagerService

053ce0d CamcorderProfile: Add 1440p camcorder profile

93350ed Access mView in the thread which created the ViewRootImpl

ed3b11b SystemUI: Add task manager

f602ad7 Scroll: modified velocitytracker

37d1cf1 handle timeout of requestNetwork

79bc3ee Skip duplicated appop checking of ContentProvider.

27fedf7 Restart persistent process if start timeout.

e2a3d70 Reduce sscanf times for optimization

dcc4266 Make 'Restrict Background Data' notification swipeable

cb34aeb Trace SQLite operations

81bb011 Forward Port: Smoother Upload and Download Animation

5339bad Fix On Tap Home button

8714598 Enable advanced power menu by default

a2258bd Force Expanded Notifications [1/2]

cac84d6 Bootmsg: The app name is now displayed in bold text.

f1c0ac5 Show Optimizing app dialog on first boot

eed4708 BootMessage: Show each app name being optimized during boot

625dc2b Build libc++ as static dependency

0d7c6f5 Assorted changes to fix syntax on previous commits

2cb7121 add support for 4 digit mcc/mnc

dfe24da return from functions early that modify apk for compat purposes

4726da9 remove constraint on requirement of AndroidManifest.xml

d9d1b7b allow uppercase letters in resources

b931099 add feature: forcedPackageId

2088aa5 add miui rules (including godzillaui)

7e4e45a call log limit 500=>5000

fa2d2e9 Allow disabling of FC dialogs [1/2]

03795ea Disable Immersive Messages [1/2]

01f7cc3 Increase Touch Sensitivity

67baa36 Speed Up Long Press Timeout

d2e2987 Speed up StatusBar

8643140 Enable Non Market Apps/Disable Package Verifier

523b3c1 Change SQL to improve performance.

376c90d Disable Lots of Debugging

125820c almost on the speed that should be in stock

9713f78 aapt: Default to 0 compression ratio

b7babf6 aapt: Don't compress qmg, wbp and arsc assets

* frameworks/native/

0e89896 sf: ex-sf: Remove screenshot surface from secondary displays

* frameworks/opt/telephony/

c31d22d telephony: Notify user for potential reconfiguration.

* frameworks/support/

8eccd3a [2/4] JDK8: Fix missing include of RemoteControlClient

* hardware/qcom/fm/

71997bb fmapp2: String improvements

* kernel/google/msm/

3713669d msm: vidc: cache-flush encoder output buffers after alloc

* kernel/oneplus/msm8974/

f2b863e Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_oneplus_msm8974 into cm-13.0s

* packages/apps/Bluetooth/

0fe7495 Revert "Bluetooth: Disconnect SCO for In-Band Ringtone."

* packages/providers/ContactsProvider/

3b52dc7 ContactsProvider : Hard code group resource ids

* packages/services/Telecomm/

8c2bde1 Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/services/Telecomm into cm-13.0

* packages/services/Telephony/

a3f2b60 Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/services/Telephony into cm-13.0

df6ddbe Fix "multi-sim: fallback on active subId on emergency calls"

* system/bt/

718ba0b Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/bt into cm-13.0

* system/core/

81fba04 Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/core into cm-13.0

* vendor/cm/

8b0f16f apns: fix build

bc61d86 apns: Add ATT Nextgenphone

73acac5 Resolve Orange RO authtype

* vendor/cmsdk/

5e2d5a6 CMSettings: Add VIBRATOR_INTENSITY setting

9714d7f CMSettings: Add FEATURE_TOUCH_HOVERING

9f12465 cmsdk: Minor string improvement

* vendor/huawei/

ffa22cc Merge pull request #17 from nuclearmistake/cm-13.0

* vendor/motorola/

ca18ad5 shamu: Nexus 6 (Mobile) binaries for Android 6.0.1 (MMB29V)

45c8b43 condor: Add adsp libs for camera