| commit | 7e1ce27c08ec57032520613488ec2fe5b3795126 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Thu Jan 20 18:08:34 2011 -0800 |
| committer | Ed Heyl <edheyl@google.com> | Thu Jan 20 18:08:34 2011 -0800 |
| tree | d80193110ef570bdf2643e0c428b2f3e4974cfbe | |
| parent | 7dfc1270967c96be6dcd58fb7770c07482a7e90d [diff] | |
| parent | 50738779d90970a3e36fe40a78df724946f323db [diff] |
Merge commit '50738779' into gingerbread-plus-aosp Conflicts: core/version_defaults.mk Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f