diff options
| author | Christopher Ferris <cferris@google.com> | 2015-02-04 18:56:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 18:56:45 +0000 |
| commit | 9368dadcbcd7d677c0f3999bd3947159f2d861fa (patch) | |
| tree | 922b85ebe7bfffca93708e5f4318cbb22ab28aad /include/media | |
| parent | a27e2f71799a7a21f82d8d407faccfa2018e1dbc (diff) | |
| parent | 16c62c468aacf40496a7cad94f49795a797cdd37 (diff) | |
| download | frameworks_native-9368dadcbcd7d677c0f3999bd3947159f2d861fa.zip frameworks_native-9368dadcbcd7d677c0f3999bd3947159f2d861fa.tar.gz frameworks_native-9368dadcbcd7d677c0f3999bd3947159f2d861fa.tar.bz2 | |
am 16c62c46: am 50ad67e4: Merge "Add better timeout mechanism for running commands."
* commit '16c62c468aacf40496a7cad94f49795a797cdd37':
Add better timeout mechanism for running commands.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions