diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 16:47:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-16 16:47:18 -0700 |
| commit | c826f92e6f90f4157afd4ed69c6907ff768a0d6b (patch) | |
| tree | 0296786cc942ebb3f56df897047a2c861e216f5d /media/libstagefright/codecs/amrwbenc/inc/wb_vad_c.h | |
| parent | 2f04883ff880966d63d1aa4a1c7b05e497cfcc58 (diff) | |
| parent | fe9aa2706ff9e5059d5e2737d751122fb5d692b9 (diff) | |
| download | frameworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.zip frameworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.tar.gz frameworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.tar.bz2 | |
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/inc/wb_vad_c.h')
0 files changed, 0 insertions, 0 deletions