tree 7f28936b13ecbea2c4a72452f50a3dc2e825b264
parent 82f7321b03eec1e40af9d681370f754ee0279582
parent 389636ce967af15e72817e2133907a2cb2efd1ae
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