| commit | 220ee10a8dbab14a5769c0d10c6ab4465becb6b9 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Mon Oct 11 17:48:24 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 17:48:24 2010 -0700 |
| tree | 8fe483b29e1c6a4cfe858e0611ab297f3418963b | |
| parent | 9f90cffa30cf8c12bc7c4fa6f92d0298e039aed6 [diff] | |
| parent | 074547f689e42e3a09fea5685b491c482fa73cdd [diff] |
am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf' * commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf': Updated media playback controls, unlock screen, misc framework assets