OSDN Git Service

Merge from jb-mr1-aah-dev
authorJean-Baptiste Queru <jbq@google.com>
Fri, 28 Sep 2012 21:17:13 +0000 (14:17 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 28 Sep 2012 21:17:18 +0000 (14:17 -0700)
commit94077c246741fff9f13f727a54e8fe2c2c58d27b
treec45469e5ca87d69a5f268419f5fea8223ebca2af
parent44f4f00e8dad1b96e7a3ba1a3552531c458ce6e5
parent5fb2052d70a135e8b040630205a44c9de9961fcb
Merge from jb-mr1-aah-dev

Change-Id: Ia884306cfe4a9389856be0f377351aacf4cb2e36