commit | f99e8650c931026e0e119ede672ee12a2d2867a7 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Mon Nov 11 15:47:36 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 11 15:47:36 2013 -0800 |
tree | 16c117839e63bad3b10b691547f33d4c20bfedcf | |
parent | 34163e8259db8661afbb267e3b899b64f429bcb7 [diff] | |
parent | fed822cb8e17579dfa792b40ebe82683088e7779 [diff] |
am fed822cb: Merge "Fix Tethys asset" into klp-dev * commit 'fed822cb8e17579dfa792b40ebe82683088e7779': Fix Tethys asset