OSDN Git Service

manual merge of 547b902e
authorJean-Baptiste Queru <jbq@google.com>
Sun, 10 Oct 2010 19:00:02 +0000 (12:00 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 10 Oct 2010 19:00:11 +0000 (12:00 -0700)
commiteef1d7d422ac85a8b4de9a9ef1415c8537f33406
tree0d4ae50aebab2bed2e5074c85a5083e118c589ab
parent02a7a7a3ec7f817d2cc4da24cdece4fd8e5b0e99
parent547b902e990fcb3c3e09ef464f3eebd9368c6c77
manual merge of 547b902e

Change-Id: Ibfc409f53a82bc7cb5caa6aaf94e18589e06009b