| commit | 2dd69cfca3e2a2b7c398198366d03ba1801e1bd9 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Apr 15 08:34:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 08:34:32 2013 -0700 |
| tree | f4d92dfd643f05f5cd49e15eb530783eeeb13d5f | |
| parent | 45ec469f2d9b323ed0ba784069888bc40d63cbbe [diff] | |
| parent | 5ce9c299a64a1568165fc66adb2cf68d89198a90 [diff] |
am 5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev * commit '5ce9c299a64a1568165fc66adb2cf68d89198a90': Instead of returning an error, return an invalid duration (-1 ms)