| commit | 1a6530864af8d3ecae5f90090ccf67801a989279 | [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 | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | df904933d720e78b93e976720ecc5e638087e622 [diff] | |
| parent | 31dddb8af6f7163a8ffd8fe5b28d4ac2784bae35 [diff] |
am b2b973d1: (-s ours) am 3bd9b8f0: Fix build breakage. Merge commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76' * commit 'b2b973d13edb0a043a0288838f41eb84e9c78f76': Fix build breakage.