| commit | 1cce37b477be13c30ba7b0aa4bacc794350ee530 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Sep 07 14:48:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 07 14:48:28 2010 -0700 |
| tree | 8c5bc095ed64c30d9a5710fa97060928e7e03f2b | |
| parent | 3d2bca9abdf509d31fb4bf4a00ec7282f41f8da8 [diff] | |
| parent | d8f1a656cb0cc840d908b78f73a11e755db54ab0 [diff] |
am 05dff838: am 11bbe200: Hopefully fix the build. Merge commit '05dff838946abb01caa3c3172cf0f367964a0b6d' * commit '05dff838946abb01caa3c3172cf0f367964a0b6d': Hopefully fix the build.