| commit | 56645e26d70537f47c61272da24628d188b31b10 | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Apr 14 16:33:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 14 16:33:44 2010 -0700 |
| tree | 5ff7e4436afafca9709567328063e3de4af07810 | |
| parent | 9d3b3e1324ad30e228ed7e0d66fdbfca7376a20a [diff] | |
| parent | 8f5a800116f700b0af21d2a8468165bcf51b841c [diff] |
Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken