am fed822cb: Merge "Fix Tethys asset" into klp-dev

* commit 'fed822cb8e17579dfa792b40ebe82683088e7779':
  Fix Tethys asset
This commit is contained in:
Jean-Michel Trivi
2013-11-11 15:47:36 -08:00
committed by Android Git Automerger