am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into...

author Chong Zhang <chz@google.com>

Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)
author Chong Zhang <chz@google.com>
Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)
diff --cc include/media/stagefright/ACodec.h
Simple merge
diff --cc media/libstagefright/ACodec.cpp
Simple merge
author	Chong Zhang <chz@google.com>
	Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)
		1	2
include/media/stagefright/ACodec.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/ACodec.cpp	patch \|	diff1 \|	diff2 \|	blob \| history