OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 17:23:37 +0000 (10:23 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 17:23:37 +0000 (10:23 -0700)
commit8056eb1b0e219e58f5292d51fab846857aeba8d8
tree8e45ae937b928a21112848ce35bc73bdf092526b
parent565bce248b0a21f9cf42329d5b5d0aa6dd425959
parenta033281af536769e6ab9ebfacc321fef62443ae3
merge in master-release history after reset to master