OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 11 Dec 2012 15:49:50 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 11 Dec 2012 15:49:50 +0000 (07:49 -0800)
commit7ec388959ecb56e42783c12ad354d81ac2cf08a6
tree700a8e5f723759ea4b18b90e2a80e6c9f7f7b10b
parent151cb90c6093d5b4371b9367b507f8aa7c1a4370
parent59fc2de6c1a5aabdaf3f891c50e9efaf8f9a7292
merge in master-release history after reset to master