| commit | 92279c0fa1c15bd4afaf051bed90776fa64744c1 | [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 | 77774c691c206d4b70913ce947a5ca5c48c8a58e | |
| parent | 51704fc9c2f42e72a86f580c3e2aa977e8b6b006 [diff] | |
| parent | e34ed24f4d32ad20716caf3056a7b007a0277500 [diff] |
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp