OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 31 Dec 2012 15:49:13 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 31 Dec 2012 15:49:13 +0000 (07:49 -0800)
commit803bd660b62161568e6074f72108d91748b759cf
tree7b2805422e6daf1a7a62499380dcc2dccc547aeb
parent36a9f354c0931bd7ae94ff8f52030703499c99f5
parent2937d9ab54a101f281ff539f7c2eb82cbd74574a
merge in master-release history after reset to master