diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 13:45:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:45:30 -0700 |
| commit | 52d14be1190809ee6f4274315c98e50a1e6b0231 (patch) | |
| tree | ede5d6def33b0b7b4d903db524a0629ca035203a /graphics/java/android/renderscript/Element.java | |
| parent | 564a9f2434194efc8fa56fd199e1a83c5807ffc1 (diff) | |
| parent | 47f2cf620731226a9311db0f864a4e1404e54b96 (diff) | |
| download | frameworks_base-52d14be1190809ee6f4274315c98e50a1e6b0231.zip frameworks_base-52d14be1190809ee6f4274315c98e50a1e6b0231.tar.gz frameworks_base-52d14be1190809ee6f4274315c98e50a1e6b0231.tar.bz2 | |
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.
Diffstat (limited to 'graphics/java/android/renderscript/Element.java')
0 files changed, 0 insertions, 0 deletions