summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrwbenc/src/mem_align.c
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-13 11:28:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-13 11:28:09 -0800
commitf4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a (patch)
tree8bb6adcabdbe22194926469102f06c25ec054845 /media/libstagefright/codecs/amrwbenc/src/mem_align.c
parent09192653e836b21689f004bf8dee375356641181 (diff)
parentb45e50a5bce5fba740318d056c8dd1fd9caed354 (diff)
downloadframeworks_av-f4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a.zip
frameworks_av-f4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a.tar.gz
frameworks_av-f4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a.tar.bz2
am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86': stagefright aacenc/amrwbenc: Remove trailing whitespace
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/src/mem_align.c')
-rw-r--r--media/libstagefright/codecs/amrwbenc/src/mem_align.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/mem_align.c b/media/libstagefright/codecs/amrwbenc/src/mem_align.c
index e58915a..a29baf3 100644
--- a/media/libstagefright/codecs/amrwbenc/src/mem_align.c
+++ b/media/libstagefright/codecs/amrwbenc/src/mem_align.c
@@ -27,7 +27,7 @@
/*****************************************************************************
*
* function name: mem_malloc
-* description: malloc the alignments memory
+* description: malloc the alignments memory
* returns: the point of the memory
*
**********************************************************************************/