OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 1 Mar 2014 13:51:09 +0000 (05:51 -0800)
committerThe Android Automerger <android-build@google.com>
Sat, 1 Mar 2014 13:51:09 +0000 (05:51 -0800)
commit9ea6dddee0634b41bbb68fa64cdec2996166978f
treeb05cd06e2025214ab320058025631394d8aaa782
parentf7890677dfa2a420f0752055c25cca18cb42b1b5
parent586b1952741e57920fd7849e716d05da8972dd3f
merge in master-release history after reset to master