OSDN Git Service

Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
authorXavier Ducrohet <xav@android.com>
Wed, 29 Jun 2011 01:52:59 +0000 (18:52 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jun 2011 01:52:59 +0000 (18:52 -0700)

Trivial merge