OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 18 Apr 2013 14:50:16 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 18 Apr 2013 14:50:16 +0000 (07:50 -0700)
commit082deedeec4c522db0538db211b5ff69757ebd12
tree73f84c228bc39e471429f806ae243e0b3d26ecac
parent87aa98befe4ed08d15ba2287096b358f7993104e
parentc96b64f3f990e618f37fa74b93d70fb423005a02
merge in master-release history after reset to master