OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 18 Apr 2013 14:49:45 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 18 Apr 2013 14:49:45 +0000 (07:49 -0700)
commitb97e6951fc35eda9b8a095577511f68290c70470
tree6bf7f16a2ae02a2fb514a2c930eb68bfdf38224b
parent4390825a6f28fe1652e89af9adc1452683a3d4ef
parente896ea5e645e7a75b2a0e9ff831528a60c6a04e4
merge in master-release history after reset to master