OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 5 Mar 2013 15:49:50 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 5 Mar 2013 15:49:50 +0000 (07:49 -0800)
commitdd0be845c9357719ecd858f1c250d11128c2320b
tree25ad5112b9963cd7f6f822690ad1c7f8afef9ef6
parent558f51013502ad9be4bdd08f78f897ff4a71e460
parent1ebbe9a8b4cd9bfe98540195da523279aa54c0f1
merge in master-release history after reset to master