| commit | 5e9f481984455ebf0f0066afb95b6db1f24f6288 | [log] [tgz] |
|---|---|---|
| author | Rebecca Schultz Zavin <rebecca@android.com> | Mon Feb 07 11:38:34 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 07 11:38:34 2011 -0800 |
| tree | 9deab5762327530c5c1a7dd5d39bd30fdd74ee74 | |
| parent | d155e16f0446a03bc388bb02960ae3618b40761c [diff] | |
| parent | 98ba0ab94b8b5aa1f052607bf79c985609c20860 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base