OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 7 Nov 2012 15:49:17 +0000 (07:49 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 7 Nov 2012 15:49:17 +0000 (07:49 -0800)
commitbace2c47d3ad2aa9bd69259dc1fe54875bfd5094
tree064445dc08e804a406ef039a5f655aef134da3be
parentd15c8737ce3c38bfd762667dfc52a537a4b66c73
parent5793235ec4377fea1d10a71a42f0f1f6901a1f83
merge in master-release history after reset to master