OSDN Git Service

resolved conflicts for merge of 67a50f99 to ics-scoop
authorEric Fischer <enf@google.com>
Thu, 2 Feb 2012 22:00:17 +0000 (14:00 -0800)
committerEric Fischer <enf@google.com>
Thu, 2 Feb 2012 22:00:17 +0000 (14:00 -0800)
commitcbbfffca1e17a2234d3a3849b1b71060ca25f22d
treef6081f3a1dc92aac66d5c23738f1cc8e91777c20
parentcd92dd07546a7fe410e3d0184cfafa3561b72050
parent67a50f99d80b76337541fb71f98025c0b144e5b5
resolved conflicts for merge of 67a50f99 to ics-scoop

Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa