OSDN Git Service

Merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 17 Sep 2012 17:52:58 +0000 (10:52 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 17 Sep 2012 17:53:04 +0000 (10:53 -0700)
commitfa7f50eb387bbf00c3730b04b9280dfa47157bd3
tree366c6f744e4ee29045aa02e041dc0fc52bfed9cb
parent940616761f5e1a10e00390de8952815ffb121a88
parent2ebf3eb94d5aa3119af7a4b7d0a4241a8a91e601
Merge

Change-Id: Ic9b2ccc47431764df8248f64d3e72b0f32ac5488