OSDN Git Service

Reconcile with jb-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:25:25 +0000 (15:25 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:25:28 +0000 (15:25 -0700)
commit992b10f49def736e424b9d6e01130de28b09cd1f
treef48bed420b337cec8dce0e01ab3b2ae4be27d64f
parent978afbdbf1e4b5e950f419ad5c24d08cd7df1f6d
parent0531f20404b2e284d1b444d5af48b6e0c629975b
Reconcile with jb-dev - do not merge

Change-Id: Ie7428c559f53a12d88e9afdbd7234423881aed0f