diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
commit | 48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3 (patch) | |
tree | 140491ed6e10eb1f61cad29c366ad9d7f2ccfbcd /res/charger/LICENSE | |
parent | 170e8cf8f0608848e2acb354faf0d2203fb2d08a (diff) | |
parent | 4ab492610e6f9654a4f51426d5e8f4871b338063 (diff) | |
download | device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.zip device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.gz device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.bz2 |
Merge remote-tracking branch 'replicant/replicant-4.2' into replicant-6.0
ril and vibrator do not work
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
cm.mk
i9300.mk
include/telephony/ril.h
init.smdk4x12.rc
overlay/frameworks/base/core/res/res/values/config.xml
system.prop
Diffstat (limited to 'res/charger/LICENSE')
-rw-r--r-- | res/charger/LICENSE | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/charger/LICENSE b/res/charger/LICENSE new file mode 100644 index 0000000..732945d --- /dev/null +++ b/res/charger/LICENSE @@ -0,0 +1,2 @@ +Copyright: Copyright (C) 2012-2013 Paul Kocialkowski <contact@paulk.fr> +License: Creative Commons BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/> |