| commit | 6967f0960449ac531880cc3e1a7312d45d774b62 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Oct 21 10:56:19 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 10:56:19 2010 -0700 |
| tree | 9eb3c0d10580a1e504576cc48b90db3bf18f9a40 | |
| parent | fbd21b5875285725c434fc7d0145e919d0133946 [diff] | |
| parent | e55806a55561c992086ddff717aca27206fa0c5d [diff] |
am e55806a5: am 23392a84: Fix the build. Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d' * commit 'e55806a55561c992086ddff717aca27206fa0c5d': Fix the build.