OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 1 Mar 2013 15:50:14 +0000 (07:50 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 1 Mar 2013 15:50:14 +0000 (07:50 -0800)
commit348e0ab699524bc6127aa2309659132c01b650d3
tree184efa40ee389f1302d6197dfc615c7cea06180a
parent19483dacfd6a1728df2935679cdc2e8b091e2a61
parent72c73bccca5a65743645f603a315764ad712e72f
merge in master-release history after reset to master