DO NOT MERGE: Don't log passwords returned from vdc

Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
Framework: safe headset volume option (1 of 2)

thanks DvTonder

Change-Id: I5355820a24d48c1d8f54ea17a7022d891ad07857

Conflicts:
	media/java/android/media/AudioService.java
hwui: Don't discard framebuffer on exynos4

The layers gets empty/not cleaned and redrawn on top of the preview,
causing beautiful glitch on homescreen, and drawing black instead
of transparency.

Change-Id: I633b104224c73c625f1193ee3dde41823cddc5bf

Conflicts:
	libs/hwui/LayerRenderer.cpp
Factor out preference-in-storage check to overridable method.

Change-Id: I2fff3192802f8a180330fda66388eda394334a5a
Treat default value that wasn't found as empty value.

Fixes http://code.google.com/p/android/issues/detail?id=33220

Change-Id: If22e8b245f688d922c168aa54c8acf743c0644d7
Wipe and re-create database on downgrade.

Not a very common situation but should fix some errors that could
 arise from flashing an old ROM over a new one, without wiping data.

Change-Id: I27f2a00396761105987830921bb3f8cb339d2171
Fix certain setting writes being incorrectly skipped.

If a value that previously had a very long value (over the 500 char
threshold) is now set to null, isRedundantSetValue would incorrectly
return true even though the value was changed.

Change-Id: Ia5304743024ec01024be98aa51ed260d38caf93c
Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54

Conflicts:
	core/java/android/widget/AbsSeekBar.java
merge in lmp-release history after reset to lmp-dev
DO NOT MERGE: Don't log passwords returned from vdc

Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
Add class for identifying slim build type and version.

Change-Id: I844bc9d983459c4ac075c128414a3e37bda2b82e
[DO NOT MERGE] Increase min free levels for cached processes on 64bit

Requires less memory pressure to start killing cached
processes.

Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)

Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit 559e6d34b4e76ee21dc6e300681c399ed735a964)
Merge tag 'android-5.0.0_r5' into HEAD

Android 5.0.0 release 5
Revert "(2/2) FrameworksBase: Adblocker"

This reverts commit bc180a4dce4a3c200a84fe91a595e328a0bc31d5.

Conflicts:
	core/java/android/provider/Settings.java
Merge https://github.com/BrokenOs/frameworks_base into lp

Conflicts:
	core/java/android/provider/Settings.java
Revert "Merge https://github.com/BrokenOs/frameworks_base into lp"

This reverts commit 69ab1497ced29d00c26370478a76a42a77ad7682, reversing
changes made to a27544cc4313837ff7ccdc7f538578189cff8cff.
Add ifdefs for QCOM-specific features

Change-Id: I6e140e0dab9f2ce929c356f9c486309bb7e23099

Conflicts:
	core/jni/android_hardware_Camera.cpp
	core/jni/android_media_AudioFormat.h
	core/jni/android_media_AudioTrack.cpp
	core/jni/android_view_Surface.cpp
Revert "Add ifdefs for QCOM-specific features"

This reverts commit 60872a30e02824c80566e12c9aa7774e6c8dbda0.
Disable/Enable screenshot sound [1/2]

Change-Id: I9f32d0026833f9350a2e8e4bedaff3801f508e76