am 51cf5c73: am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev
am 51cf5c73: am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev

* commit '51cf5c73107e2265dbf1cf951720812381d0ad4d':
  Fix Tethys asset

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