| commit | 1f11fdc2e99df4ed91b20fc474f9fe86fdfe53d4 | [log] [tgz] |
|---|---|---|
| author | Daisuke Miyakawa <dmiyakawa@google.com> | Thu Sep 02 13:58:25 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 02 13:58:25 2010 -0700 |
| tree | 892332b39e4fb5c1f2814436e09e3d2538471be9 | |
| parent | c172979fcf535faf0f2fd96d5fcf36bd89c83805 [diff] | |
| parent | b2b973d13edb0a043a0288838f41eb84e9c78f76 [diff] |
am b2b973d1: (-s ours) am 3bd9b8f0: Fix build breakage. Merge commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76' * commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76': Fix build breakage.