OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 8 Apr 2013 14:51:14 +0000 (07:51 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 8 Apr 2013 14:51:14 +0000 (07:51 -0700)
commita10cbcf137eef929d9c2281d662a7e6a03d941fd
tree3f6cc085f4c6ba6f250fd74da2bd83cc7bd054d8
parent916676515b5605bf9f6f78ea579fbf2bd637fac2
parente943eb1ec74cbfb49694b9fdcfeae8e8afac0de5
merge in master-release history after reset to master