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