Wave after wave...

Change-Id: Ieb107d1aebc36968b166ee574a22889e3bec4838
Merge branch 'kitkat' of https://github.com/AOSPA/android_vendor_pa into kitkat