OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 5 Jun 2013 14:49:54 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 5 Jun 2013 14:49:54 +0000 (07:49 -0700)
commitefc5194d4f22a29df2154656eaaeb652ed85b1b5
tree7d8c3476219aa38184cfdfc3a57a0a1b63b0a070
parent5b27decb1d59b3d35194f28e49d98485c0e57427
parent5309d0263137d67b6517ffab23523306257eda81
merge in master-release history after reset to master