| commit | 5645dc379a79e4d7b3248a7faa92edd6c2fae732 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Aug 31 13:12:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 31 13:12:56 2010 -0700 |
| tree | 7eae9db3a5019f19e9d94cd84cd6b1a611f4f153 | |
| parent | f161663814f4c372a8fa815dc787f18b09c66938 [diff] | |
| parent | 42ee0a2a48f87922dc98f93abbe3394750b9c3f7 [diff] |
am 42ee0a2a: (-s ours) am cd7c775e: fix the build still Merge commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7' * commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7': fix the build still