diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-11-30 16:23:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-30 16:23:29 -0800 |
| commit | cc20f3c384d096afe661a0b3ba51e65e721196ce (patch) | |
| tree | 465a8a636ff9ab30b0df768f22891bceffb20e21 /media | |
| parent | 342a9be0096752aa0ae80120a64751a7d0b9e7a2 (diff) | |
| parent | ea6bb1b4d7111dfd084f772f83094bda662fdb23 (diff) | |
| download | frameworks_base-cc20f3c384d096afe661a0b3ba51e65e721196ce.zip frameworks_base-cc20f3c384d096afe661a0b3ba51e65e721196ce.tar.gz frameworks_base-cc20f3c384d096afe661a0b3ba51e65e721196ce.tar.bz2 | |
am ea6bb1b4: (-s ours) am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
* commit 'ea6bb1b4d7111dfd084f772f83094bda662fdb23':
DO NOT MERGE fix runstate race condition
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions