OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 14 Jan 2013 15:49:35 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 14 Jan 2013 15:49:35 +0000 (07:49 -0800)
commit5e5d7545e846f53e136bd1a07f27ffc57adc0ac9
treeb2944ccadd80d382eb9ab41700b492ea36f319f9
parentc19c15174b1a07c5d18f45f26bee7893481ab41d
parente9dbe75aa7f1addb46e75ea66aef6ac966b1c4cd
merge in master-release history after reset to master