OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:17:15 +0000 (09:17 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:17:15 +0000 (09:17 -0700)
commit338890636b1d9d28b3afdffe76a5eb3c20dc4ccd
treee228b460dd05bef1b0ba8939b647d47fd9a19da1
parent69babbdc3895b91d782e9ac06d84f7fdd8a29cbb
parent27b89fa1e7ac55a3cedc8b3b946cc91f876f1f1b
merge in master-release history after reset to master