| commit | fe96a021cfa60aa4196df25f754cac5159ad3940 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Apr 29 15:11:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 15:11:38 2011 -0700 |
| tree | a7a35a123a66ffa2421f1e5d015a05bd12afa237 | |
| parent | a02a9e602bf1b5337cde30ee16ca6c4a36d9f07b [diff] | |
| parent | bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b [diff] |
am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp * commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':