OSDN Git Service

Merge 2f16ba59
authorJean-Baptiste Queru <jbq@google.com>
Fri, 13 Jul 2012 19:13:54 +0000 (12:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 13 Jul 2012 19:14:04 +0000 (12:14 -0700)
commit938cf057c5988c155fc316daf7bac301e2e019fd
tree8a1933a06a125b9c2bbf8aa988ba81fb611c0114
parent96d9fa29cd1ff48b733eb090e99fe165d194d313
parent2f16ba59974adadc0e18dddb56d461c336b09bbc
Merge 2f16ba59

Change-Id: I3bf0eacfde7c61e22dcf6c2709fc7caccdfd48cc