| commit | 9bf10f139d4f2454df66a82efb90442a9c4cf834 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Tue Dec 02 19:53:24 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 02 19:53:24 2014 +0000 |
| tree | caaa216d04330d434847203c58549504e46b2006 | |
| parent | 41cf4cec9f4e470731f9004799a6faca7555e683 [diff] | |
| parent | 06080ca7a376ae484c0589ebf415d876e42991b2 [diff] |
Merge "Chimpchat: use shell timeout from DdmPreferences instead of hardcoding" into studio-1.0-dev