3.69

Change-Id: I512d2603db556be15a0ce2bc6ba089edd5984dc4
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_vendor_pa into jellybean