OSDN Git Service

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