| commit | c0f3e83df195fe6b97a3f56a32e65672fdb556b5 | [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 | 3f4ae29dd568b69be2cb8dc2fc97ea9044960543 | |
| parent | 1ad9b43ac768600dad63c5bcd93b56b5b2a76f25 [diff] | |
| parent | 34483e7494ac9e0e3215fbb4490f0f69a615058b [diff] |
am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp * commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':