diff options
author | Andreas Huber <andih@google.com> | 2013-04-15 08:38:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 08:38:22 -0700 |
commit | 0011777d54148dc84a923dda21b25f4f5a99ffed (patch) | |
tree | ddee593d432336ad174f2f36bc4f92e200e3f35d /cmds | |
parent | a191eb5d45e49ec1f7333f16be9ce12f7ef0b9e1 (diff) | |
parent | 2dd69cfca3e2a2b7c398198366d03ba1801e1bd9 (diff) | |
download | frameworks_av-0011777d54148dc84a923dda21b25f4f5a99ffed.zip frameworks_av-0011777d54148dc84a923dda21b25f4f5a99ffed.tar.gz frameworks_av-0011777d54148dc84a923dda21b25f4f5a99ffed.tar.bz2 |
am 2dd69cfc: am 5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev
* commit '2dd69cfca3e2a2b7c398198366d03ba1801e1bd9':
Instead of returning an error, return an invalid duration (-1 ms)
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions