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