diff options
| author | Jeff Hamilton <jham@android.com> | 2010-05-27 09:42:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-27 09:42:44 -0700 |
| commit | c0046aab0c4a5fd3ae091040c739652a0a4c029e (patch) | |
| tree | 68a789aa91ae507d00c4e816d27083f256aa19c3 /media/libstagefright/CameraSource.cpp | |
| parent | 2cb138dbe89c493547066679e1a8ef1ae0a848de (diff) | |
| parent | edf228ce1fc9aae9fe314229c19e80a434bb4393 (diff) | |
| download | frameworks_base-c0046aab0c4a5fd3ae091040c739652a0a4c029e.zip frameworks_base-c0046aab0c4a5fd3ae091040c739652a0a4c029e.tar.gz frameworks_base-c0046aab0c4a5fd3ae091040c739652a0a4c029e.tar.bz2 | |
am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken
* commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
0 files changed, 0 insertions, 0 deletions