4cb4f7ce9184de9a221239c28afcf912e7e1ed43 |
|
03-Oct-2008 |
Dan Bornstein <danfuzz@google.com> |
Manually merge change #111620 from tc3 to mainline, to keep the automerger from choking on it. p4 sync p4 integrate -r -b android_to_tc3 //...@111620,111620 p4 resolve -a p4 resolve # resolve a couple merge travesties PRESUBMIT=passed BUG=1399648 TBR=edheyl OCL=111902 Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2 Signed-off-by: Glenn Kasten <gkasten@google.com>
/frameworks/av/tools/resampler_tools/Android.mk
|