OSDN Git Service

merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c
authorThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:48 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 3 May 2014 12:51:48 +0000 (05:51 -0700)
commit4c830ad7548d79d2b1fb43aad933ad5618b5866b
treef0273234445f430c2d3baa8566181cf4ff4a97d9
parent978d30d0e046c971b37a6fc20480615f1c55f55c
parent3ce878cbc6faa744b0e513ddd12c5eaf62ba16ed
merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c