OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 4 Jan 2013 15:49:34 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 4 Jan 2013 15:49:34 +0000 (07:49 -0800)
commitc1720b29d9257ad0e760dccc6b390b6a3ba9bb39
treec8e7057acfed9aefff1824cf1e6767247820971b
parent0aa212e32ad0ef1333941e2c5228c7528da3c40f
parent3daf23b0a767c7d8bb18d77e192ee16a8912f73e
merge in master-release history after reset to master