OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 15 Apr 2013 14:49:56 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 15 Apr 2013 14:49:56 +0000 (07:49 -0700)
commit4a58a995fdad7254d522008e3a4233ae3d6ee586
tree576721dd09c8bdfb6453f55e1e9919905404fbba
parentdf9ac0fc0627f82018dc69c9a874a73d762e7b0b
parent5950f15a3147149c323f2d1bc88d15e8b9673481
merge in master-release history after reset to master