tree 9ed9102ca00cbd90b635642aaeef14510c72406a
parent 76881afbfb814e224d19dc90cc409064cdeecd90
parent 6d29e3924090d75cd241970af998bca7296bc7fa
author Andreas Huber <andih@google.com> 1283373567 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283373567 -0700

Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread