| commit | f1aedc319723dbbe663581b9c2db9b747efe310d | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri Aug 20 06:27:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 20 06:27:27 2010 -0700 |
| tree | b3719b3d6d3e1b23addab82e7597eb65a88a4b2b | |
| parent | 569cf07b291612a5bcf7299c457ce7d457652558 [diff] | |
| parent | 26ab891f86569010f72fd7243ae255f7aea4a397 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base