OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 14:52:10 +0000 (07:52 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 25 Oct 2012 14:52:10 +0000 (07:52 -0700)
commit2654447c0ead90b8523661ef358d0ade20465070
tree3fbf9609bcad3809fe61fcf92198cdae144498bc
parent4cdc42620746d0a0f78915f427842b916e8a58df
parentf40c69c2593695d5833e28a075b18b1f361ba4fb
merge in master-release history after reset to master