OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 12 Jun 2013 14:51:06 +0000 (07:51 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 12 Jun 2013 14:51:06 +0000 (07:51 -0700)
commit0be2a20c0f5a66f9eaa7769cb7150582ec7c7409
treed3fe460f067c6a275d7031f50d1efa3cc62a8aa2
parentfc1f308ca1d679f9e9823a848e6396a23513f2fb
parent4f63887168886014f716fb365a88a54b1eb8e464
merge in master-release history after reset to master