OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 4 Apr 2013 14:49:16 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 4 Apr 2013 14:49:16 +0000 (07:49 -0700)
commit5208edf65ef3961211c5e781b24db951b1d80b67
tree18c77dae409094b01c3c7f00cce57b0abddfa984
parent76d09fb76aea758077c04f5b7287c39fdf86bef7
parent7ac8cbae4357b633dd74f374cefd6139770e99c3
merge in master-release history after reset to master