OSDN Git Service

Merge from jb-mr1-aah-dev
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:06:56 +0000 (17:06 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:06:59 +0000 (17:06 -0700)
commitadc32bc3b18576a554143631ab72dc14c1b905c3
treef4a8da28ab0911589f257760df8c8b41f17ca95b
parentc556da9ed7b0142523d349e7af8ba6492b98a683
parent52b4ccbc493084fed0285bbb15f6534a68e65adb
Merge from jb-mr1-aah-dev

Change-Id: Iea13ecd8b6edd42b3dc9c59755d51c1bb36afe4a