OSDN Git Service

Reconcile with jb-dev
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:14:31 +0000 (15:14 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:14:50 +0000 (15:14 -0700)
commit2cb0549a18232b262b5c01b86319cbc6fece252e
treec2f08a42b5eca1dc18840567b7ec461c7c34b244
parent01b2aaaa89447759d3f80ae8db58098a428fdc3c
parent582db97b23982f8e9cac7926ac3f5806b6a9cc71
Reconcile with jb-dev

Change-Id: I759af63dfafa66468b93dc7c4ef7db42d760c4d6