OSDN Git Service

merge ics-mr0
authorEd Heyl <ed@google.com>
Tue, 25 Oct 2011 20:47:51 +0000 (20:47 +0000)
committerEd Heyl <ed@google.com>
Tue, 25 Oct 2011 20:47:51 +0000 (20:47 +0000)
commitc36fb99baa78c2d9e58307d0f7c59270b0600d24
tree28eee3f42811afd37db117e8ea5ec72270f61958
parentb49a14e180d186cc806f47248584c70e9c69343a
parent08f83402616318fecef3c721ce9841934382f65f
merge ics-mr0

Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d