OSDN Git Service

Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1
authorDianne Hackborn <hackbod@google.com>
Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)
commitb259c04d4321536ef9f5cc9b55079d3bd450eef7
tree9d87ecb453169c4ff09f2303a4b72fed29116b24
parentfbb09ea84f7a9df94358f05f4e680cb363bae663
parentb50c768a8a9662033185e063f9e433971c1b6e2d
Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1