OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 3 Apr 2013 14:50:16 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 3 Apr 2013 14:50:16 +0000 (07:50 -0700)
commiteb892e2b6788eb8d27e05dd87d6a41db32e88474
tree1206784018353993f4d34a7f2d4c116839fd1833
parentc41346d5bdaca400b1dd09139c07318221b04be5
parentb72e9919c1a0fbf7e9300f2acbfbda380ed8b063
merge in master-release history after reset to master