| commit | 295df3eb5a5592ac017b505cd078f7bbaf799c95 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jan 19 16:35:00 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 19 16:35:00 2010 -0800 |
| tree | f4547aa06838a91fc394f17e6ff967f5414d2362 | |
| parent | 5e4cc6541d3da8fadc19e6a41a14d8abed192dc5 [diff] | |
| parent | a4d81b947b36f6e84f7910ae89ce68dedb7fe6ce [diff] |
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base