commit | 56f2c6e529bc62d55fc8baa7d1b52326307474d4 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Wed Sep 01 13:45:30 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 13:45:30 2010 -0700 |
tree | 02958abbfd19bf49e1235955bd20431cdd3b878e | |
parent | 8852dbbdf3ceda01a96f3c8a814822e224239494 [diff] | |
parent | 002b34c3f56932fa472ee4a9fd47a8b021a27b1a [diff] |
am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96' * commit '47f2cf620731226a9311db0f864a4e1404e54b96': Keep gtalk video chat specific code consistent with rtsp changes.