OSDN Git Service

Merge from jb-mr1-aah-dev
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:07:43 +0000 (17:07 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 29 Sep 2012 00:07:45 +0000 (17:07 -0700)
commit60ebd88c6a8e66eb59f9de5fcf5a52d164fb406d
tree324f000cc94c926895668eac76ff5fa526771e01
parent03109c02cf159a16c34a0c49b364ad7234aba852
parente2614f2e01b189d631496729dea79bb20fa324cb
Merge from jb-mr1-aah-dev

Change-Id: Ifa8ee5e59bb3f61df4de47d52c062449bdea4911