commit | 8bfdd9a65102c13e6a0786d16bf27083be8a98ff | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Tue Jan 25 10:03:46 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 10:03:46 2011 -0800 |
tree | 1bd193fc53b4f4dfc801f7da93f53e25b6fdb54e | |
parent | 883b26db47fc1bfdc29963b6987866de0ed318cd [diff] | |
parent | 500c9e99f514bd6b3df9b04ed10a763ea752c138 [diff] |
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp