OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 10 Feb 2014 13:49:18 +0000 (05:49 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 10 Feb 2014 13:49:18 +0000 (05:49 -0800)
commit863c6684a62b645d2178c8c29b7be7b95fc902bd
treef6156b8df3722310dde71329edd7b94b59877d50
parentdb8e3c7dd2f6ddbd5b591f6d105c669ec42ccfad
parent0ee47829fc8c59b3478e5b11397b20682829e020
merge in master-release history after reset to master