| commit | 6aa616c94aff14687ace1cb3ee1874a044a89821 | [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 | 7d95323c9c81ea962d660a27662d1ae92cad355f | |
| parent | 49706753163e5da5d2484685ab74aee3e5cf8069 [diff] | |
| parent | 05dff838946abb01caa3c3172cf0f367964a0b6d [diff] |
am 05dff838: am 11bbe200: Hopefully fix the build. Merge commit '05dff838946abb01caa3c3172cf0f367964a0b6d' * commit '05dff838946abb01caa3c3172cf0f367964a0b6d': Hopefully fix the build.