| commit | 70fed89f033fa468dd6c1e3b0f3e0d6965cc7783 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Fri Jun 11 02:12:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 11 02:12:21 2010 -0700 |
| tree | c5e1565f06f22b8800b442e15f5d7b6f55dc7509 | |
| parent | 75f5e39f40df211ca63dc7eb4c72844fefc1dfa7 [diff] | |
| parent | 4977caa70035992921f9d3f8eaa8c6f28292171e [diff] |
am 4977caa7: am 1d2c25b7: kraken --> gingerbread Merge commit '4977caa70035992921f9d3f8eaa8c6f28292171e' * commit '4977caa70035992921f9d3f8eaa8c6f28292171e': kraken --> gingerbread