OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 8 Jan 2013 15:49:30 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 8 Jan 2013 15:49:30 +0000 (07:49 -0800)
commitb283c9e2bc509f7fb8b97740474a523c786b3ce7
treeb9e986a8797e6a5842c4897af8f9ce7f6a94ec0b
parent2ede4226952770714df307803e49f2ffdbd81601
parentef39df50bc765d6c9680bcf1408b86b72aeaa39f
merge in master-release history after reset to master