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

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