OSDN Git Service

Merge aaf2e765 from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 4 Nov 2010 14:28:45 +0000 (07:28 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 4 Nov 2010 14:28:52 +0000 (07:28 -0700)
Change-Id: I523c3e7def1d8dc1c9fa9308143bee952e73eeb9


Trivial merge