OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 10 Apr 2013 14:50:16 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 10 Apr 2013 14:50:16 +0000 (07:50 -0700)
commitb964fd4d309d145dd88982ff9c916e34baf4eedf
tree86e73a6603e97aa825c00686b5f23212815688c2
parent63e13c8545bb956b2f3e482e46814bd99e9c0b63
parent18f2a3ad188c3114cb3a981ea41db2b3b3eff7a4
merge in master-release history after reset to master