OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 16 Apr 2013 14:49:12 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 16 Apr 2013 14:49:12 +0000 (07:49 -0700)
commit3272bd28abeb66ead13c092e76e553b650542ff2
treebf64b27bdd4b662b790091313ded9a3cd8edba1d
parent721e3d0900242285e5a64f6dd36f2883d7cb5142
parent241dcab0acc85320021860b56f35000d50e7113e
merge in master-release history after reset to master