OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 9 Apr 2013 14:49:21 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 9 Apr 2013 14:49:21 +0000 (07:49 -0700)
commit604c0b9a4045482dffcd7bc436c37f99ba84034a
tree115da3cad144444efcf8fa0dbc64d2de187c9226
parent11f953f9577f721d0562b3b93f1cc529a0bf90d8
parentb88190f60e4a5a25ebbb1a45578c4411ae5d3573
merge in master-release history after reset to master