| commit | 78c3bed11852129be30d66882224c88903204384 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Jun 06 11:52:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 06 11:52:21 2011 -0700 |
| tree | 00a25e32363374782ade1e998b6af138b1f39f45 | |
| parent | 82ce6dbd851842aa95e3b419d336b72f681cea06 [diff] | |
| parent | f89c33c4d1e97a7b81a02098264a97dc8a987d04 [diff] |
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp