OSDN Git Service

Merge "resolved conflicts for merge of 61bb25f2 to master"
authorEric Laurent <elaurent@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)
commit777db0c08a1bee45acc2ca3fcc62ef1db6d0e221
treebb50d74a72792719b3ae9ecba7ac7bb2b6603539
parent6dee18c5cfdd5d63f3a9c299d2b61f819c07e920
parentd7b92a0ff395fa45d934eaa4242bf2598da88964
Merge "resolved conflicts for merge of 61bb25f2 to master"