OSDN Git Service

Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1
authorAndreas Huber <andih@google.com>
Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)
commit0c62c3799ea0066bfdbe14e3833beac8099ee30b
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
parent662eb58742fb433c84fccae2151f7b0a5748c109
parent325e028e16ec2d4ba40ef547bab30327789d72a8
Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1