OSDN Git Service

Merge "resolved conflicts for merge of dd24f599 to master"
authorKenny Root <kroot@google.com>
Thu, 4 Feb 2010 22:26:40 +0000 (14:26 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Feb 2010 22:26:40 +0000 (14:26 -0800)
commit8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f
tree569f5c1fc582aa41207d05a5030b7bde8f553377
parent7b4030dbe7c814c78a761d221d18eaaacfe1431e
parent2cce6267a0cdcdd3f3f369599e99f9a83bbe4be2
Merge "resolved conflicts for merge of dd24f599 to master"