OSDN Git Service

merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c
authorThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 16:11:44 +0000 (09:11 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 16:11:44 +0000 (09:11 -0700)
commitfb11fa089165840c838b2492c3dabf85c76027fe
treef0273234445f430c2d3baa8566181cf4ff4a97d9
parent978d30d0e046c971b37a6fc20480615f1c55f55c
parent1f985e93f84e260ea3319268114ad13c1fb15c7c
merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c