am d95c556e: am 37a8370b: Merge "Revert "Add header for forward compatibility"" into jb-dev
am d95c556e: am 37a8370b: Merge "Revert "Add header for forward compatibility"" into jb-dev

* commit 'd95c556e5d3398c6347f0c1cd4e4e728f82a9024':
  Revert "Add header for forward compatibility"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base