Merge "Fix Tethys asset" into klp-dev

This commit is contained in:
Jean-Michel Trivi
2013-11-11 23:44:27 +00:00
committed by Android (Google) Code Review