OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 24 Apr 2013 14:49:50 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 24 Apr 2013 14:49:50 +0000 (07:49 -0700)
commita033281af536769e6ab9ebfacc321fef62443ae3
tree29d15c6db67c142379a4f7174b3bf2d244f46eb0
parent743ec69e51ba798677366ad7dc92053120625490
parentdba4c8dd75383e78a7d535001eb54114b008582c
merge in master-release history after reset to master