OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 20 Mar 2013 14:50:04 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 20 Mar 2013 14:50:04 +0000 (07:50 -0700)
commit3c6531ea19067c35d110f711c1b297dc830dff90
tree7a56dbf60d504e50f43c06aff478c8d93024922a
parentd5db7a182658822a71f8d65fe52cb6f2692d5361
parent781d33e639f81d51a42fd2b1e5ca1454643747ac
merge in master-release history after reset to master