| commit | 4723c222f76b6d8c5406efd74a68096934e2f3ba | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Sat Aug 21 09:44:23 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 21 09:44:23 2010 -0700 |
| tree | bdc865dc1e9b18ce7b9d4fa672733499147cb01c | |
| parent | d58c7edbc379a4d20b7877cb0e9626bbab1a5862 [diff] | |
| parent | 9a5c6e4f56e574e7591d8d3af1c2b64053df407f [diff] |
am 9a5c6e4f: (-s ours) am 18ef3725: DO NOT MERGE. Fix the build. Merge commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f' * commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f': DO NOT MERGE. Fix the build.