OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 22 Apr 2013 14:49:09 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 22 Apr 2013 14:49:09 +0000 (07:49 -0700)
commitac81a630ffec052343f6106568b50d9f1e5bd85c
tree5fdde6c90e72b468e51020bc1c36ccad3c045a67
parent71678e1a5b6721365474e4680adc1fedae58881e
parent052a66ca8fbf246f59ef753cf962adf98a44dc0b
merge in master-release history after reset to master