| commit | 407b249e788f83b326376fef377e1f33ea054840 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 31 15:19:58 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 31 15:19:58 2011 -0800 |
| tree | f6fc0ccea77a13cc708b0410ee4bc0dc5b60d4a2 | |
| parent | 9f686c996bb45f0d377342fadfd20f5ae7a640de [diff] | |
| parent | e29ef594e6836cdeee09de51f3a4b9af11cdabff [diff] |
am e29ef594: (-s ours) Merge from open-source master * commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff': partial build fix partial build fix