| commit | cb623a8d44cfef63133c3c8d1d8a31aa48ba57d2 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Mon Nov 11 15:50:21 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 11 15:50:21 2013 -0800 |
| tree | 70612f7e2d3ee55cecf5a1f16ef1cf493b9b58dd | |
| parent | 874dfd733a2fd2224f155ee2c4cf5e3065676402 [diff] | |
| parent | f99e8650c931026e0e119ede672ee12a2d2867a7 [diff] |
am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev * commit 'f99e8650c931026e0e119ede672ee12a2d2867a7': Fix Tethys asset