OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 4 Mar 2013 15:49:49 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 4 Mar 2013 15:49:49 +0000 (07:49 -0800)
commit1ebbe9a8b4cd9bfe98540195da523279aa54c0f1
treeadf03e3e4c5de3bdc7ade7f954232c3c635f51ca
parentc64fcbed9f8221ec697d824962b3a4956be987ee
parent348e0ab699524bc6127aa2309659132c01b650d3
merge in master-release history after reset to master