OSDN Git Service

Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
authorXavier Ducrohet <xav@android.com>
Tue, 15 Mar 2011 18:29:07 +0000 (11:29 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 Mar 2011 18:29:07 +0000 (11:29 -0700)

Trivial merge