commit | 4977caa70035992921f9d3f8eaa8c6f28292171e | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Fri Jun 11 02:08:47 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 11 02:08:47 2010 -0700 |
tree | 7dc684cad0b5202639506c48c91ccb4bb74a4cfb | |
parent | 8ce07fabb60b557541872dcfcaf64241751be915 [diff] | |
parent | 1d2c25b7804e6fcee213b5ed81594f48c563e2eb [diff] |
am 1d2c25b7: kraken --> gingerbread Merge commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb' into gingerbread-plus-aosp * commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb': kraken --> gingerbread