OSDN Git Service

Merge commit '3c7aec3'
authorMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:11:47 +0000 (16:11 -0700)
committerMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:11:52 +0000 (16:11 -0700)
commite7728d9adcdb4481e2e9e1ab6600abd0bc1ee792
treebdce1ffe4529e58deb230771fd0e053ae9ec0d3c
parent49a6bf9356c8d43cebb000dacf94f7729ea5c541
parent3c7aec3d0b944d687e9eeb869a9f57774c213d82
Merge commit '3c7aec3'

empty -s ours merge

Change-Id: I5f47de50b940f587b4339c13798ec5797f011d02