diff options
| author | James Dong <jdong@google.com> | 2010-06-17 18:43:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-17 18:43:10 -0700 |
| commit | e6de2667d6bf4bb7b926da6784cc7eb886b93e83 (patch) | |
| tree | 03603c405c698b33d94bab15b7fc5beb8b0e8796 /include/media/stagefright/CameraSource.h | |
| parent | d26b133beec4df8608db3958045650e661ae8666 (diff) | |
| parent | e32283b15bbd60179424bdc740a4e4932da4c61e (diff) | |
| download | frameworks_av-e6de2667d6bf4bb7b926da6784cc7eb886b93e83.zip frameworks_av-e6de2667d6bf4bb7b926da6784cc7eb886b93e83.tar.gz frameworks_av-e6de2667d6bf4bb7b926da6784cc7eb886b93e83.tar.bz2 | |
am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
Diffstat (limited to 'include/media/stagefright/CameraSource.h')
0 files changed, 0 insertions, 0 deletions