OSDN Git Service

Merge commit '50738779' into gingerbread-plus-aosp
authorEd Heyl <edheyl@google.com>
Fri, 21 Jan 2011 02:08:34 +0000 (18:08 -0800)
committerEd Heyl <edheyl@google.com>
Fri, 21 Jan 2011 02:08:34 +0000 (18:08 -0800)
commit7e1ce27c08ec57032520613488ec2fe5b3795126
treed80193110ef570bdf2643e0c428b2f3e4974cfbe
parent7dfc1270967c96be6dcd58fb7770c07482a7e90d
parent50738779d90970a3e36fe40a78df724946f323db
Merge commit '50738779' into gingerbread-plus-aosp

Conflicts:
core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
core/version_defaults.mk