OSDN Git Service

Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge"...
authorDianne Hackborn <hackbod@google.com>
Sun, 9 Jan 2011 21:07:15 +0000 (13:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 9 Jan 2011 21:07:15 +0000 (13:07 -0800)
commit60bbb5cc31fb1297a6ab35b033c4b5cb887b2a34
tree5243c5a66724e9e2ccd142113405ef3911da6686
parent9a2b9e43ddf8e39a61e1beae080c001e2b0d8200
parentb97a7ebfefb3c37c42459292b0b5025123b89f2c
Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge" into honeycomb