| commit | c51dd8f0b91469bc4bb0701ca9aa397818ea311e | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri Sep 11 20:40:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 20:40:33 2015 +0000 |
| tree | 66483992fe2ad7b892a33062ae3969db18698ee4 | |
| parent | e9cc866338e07248be8a54c6c222d0da64354db9 [diff] | |
| parent | d6ddd0ca41196cfb1e9509b2f63d834751210f64 [diff] |
am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev * commit 'd6ddd0ca41196cfb1e9509b2f63d834751210f64': Add 5-second timeout to testFlacHeapOverflow