OSDN Git Service

Merge from jb-mr1-aah-dev
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:15:36 +0000 (17:15 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:15:38 +0000 (17:15 -0700)
Change-Id: I32058e2adca0ba7caf9a6f562c690ca5b68ddeb1


Trivial merge