| commit | bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Fri Apr 29 14:56:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 14:56:59 2011 -0700 |
| tree | 623efb1cbe75f1a566149830cfba54af431947f7 | |
| parent | 27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c [diff] | |
| parent | 27ad0df013e7eac9b7b9b6b207832f5ca3bf77e3 [diff] |
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp