commit | d7b1c0c4b9c5c8186ceab549b713f506d7f41d22 | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Thu Oct 21 13:44:16 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:44:16 2010 -0700 |
tree | 098417931546946efcd3ae0cd964b2d743dc5d89 | |
parent | 5a6d2934c9b3790c517b017e4102b754dd4ee258 [diff] | |
parent | 2fa7514bf85319580633d26fafafadd5a52a7317 [diff] |
am a747b439: (-s ours) am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0' * commit 'a747b4399300beae712dacdf189f10e91b3623a0': DO NOT MERGE - Updated media playback transport controls (b/3116268)