OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 29 May 2013 14:49:42 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 29 May 2013 14:49:42 +0000 (07:49 -0700)
commit4357f160f8cfb4de5bfd87685d794cdd604baf70
tree4305b78e8995112afdaf5eb32c62d45171c30490
parentc40f4e64f267c78ff04862456092002d318a8adc
parentccf8e52e249803059460de267fba8d27fa16b23e
merge in master-release history after reset to master