| commit | fd28cfcd3def4c3f7298efc4fe881f9d46a7b703 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Apr 29 15:11:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 15:11:19 2011 -0700 |
| tree | 3f4ae29dd568b69be2cb8dc2fc97ea9044960543 | |
| parent | 7e5c5809ee60c17a924829f6f298a276647e5c06 [diff] | |
| parent | 77df00abffa1d7b2885b1da7f0b99e97b1e88fb2 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base