OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 5 Nov 2012 15:49:21 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 5 Nov 2012 15:49:21 +0000 (07:49 -0800)
commit5793235ec4377fea1d10a71a42f0f1f6901a1f83
tree33e556889c54988bed6e9f6a66a37a55b120abda
parentf1566fd6923aacb00569e60b32ea66f3f6f6accc
parent80bcf547664fa807f5c2c34471582420cc6bd241
merge in master-release history after reset to master