OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 11 Apr 2013 16:23:11 +0000 (09:23 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 11 Apr 2013 16:23:11 +0000 (09:23 -0700)
commitef98d25dc92fedf543f248f21798a780d4dcff36
tree920c0bb075c933af05da8627bb29bc80c02b738b
parentfe69f9a238e366cc9e7f53ab76abb43ab50b92f4
parentfe4ac71404910e92a175d496cf675dffd0ee1e56
merge in master-release history after reset to master