OSDN Git Service

Merge from ics-mr0
authorJean-Baptiste Queru <jbq@google.com>
Sat, 12 Nov 2011 03:47:34 +0000 (19:47 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 12 Nov 2011 03:47:47 +0000 (19:47 -0800)
commit1623f79c7561b19f57c10ac303f6246deee7c634
tree66c5290cba538b72c8adbc55f477afab006ce4e9
parent324c814c6f479bb33eb8aa05d221c8a44b8f61b9
parenta5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0
Merge from ics-mr0

Change-Id: I5667c315fab589a2dc39e000a81397d317691895