| commit | 50cb1c2caf0e26091cd7fc51a9a2b59c8e17bd13 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Mon Feb 20 06:59:07 2012 -0800 |
| committer | The Android Automerger <android-build@android.com> | Mon Feb 20 06:59:07 2012 -0800 |
| tree | 5bccdcd77bf39b40ca85aca3ee13d5b5c8841384 | |
| parent | a51c4d7eeea4a8a44ff0149c29e1c2ff921a1f1b [diff] | |
| parent | 8d05123d2034ef274119a56c4554756663a0ee3c [diff] |
merge in jb-release history after reset to master
diff --git a/init.stingray.rc b/init.stingray.rc index fd34238..07f7825 100644 --- a/init.stingray.rc +++ b/init.stingray.rc
@@ -181,7 +181,7 @@ disabled oneshot -service dhcpcd_wlan0 /system/bin/dhcpcd -ABKL +service dhcpcd_wlan0 /system/bin/dhcpcd -aABKL class main disabled oneshot
diff --git a/kernel b/kernel index 6502994..c2bffb6 100644 --- a/kernel +++ b/kernel Binary files differ