OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 15 Jan 2013 15:49:55 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 15 Jan 2013 15:49:55 +0000 (07:49 -0800)
commit841b07f49c6aaa425eae63b63dcef5e5cdcf76f9
treeabf0fbec07d209aeb9cb8ee7ddb1553116c0f2ce
parentf3df96026cb5e4f0eaf6ba6ae7fa0706b7d5e2fa
parent5e5d7545e846f53e136bd1a07f27ffc57adc0ac9
merge in master-release history after reset to master