| commit | dd9f7750e39f939de0cc537efc304e7ae141cac1 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 16 14:04:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 14:04:57 2011 -0700 |
| tree | e489f888a4a7a91244a8bb82a35e0c44f7d1e31a | |
| parent | 9340ab4a213093bd59c79159011d131c9cd6996f [diff] | |
| parent | 2242af25df834a98477eedb24a1312bb24abedfd [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base