OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 10 Apr 2013 14:49:19 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 10 Apr 2013 14:49:19 +0000 (07:49 -0700)
commitdb34332b0e25830987c6e21ef04efe9449af49a4
tree1000bfe796c6e11d03b5049f448a7a417c7b577b
parent1c2fd2e5256e150fd3bccbbfbdd99cd0b2ebd9b9
parent29f76024eb7fd75c8e40b10e1f36d551c96d46d3
merge in master-release history after reset to master