OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 22 Apr 2014 12:49:46 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 22 Apr 2014 12:49:46 +0000 (05:49 -0700)
commit6f99749dd802a82dc83c4847c087ea0420977895
tree08fb49483a4768b6ced305302d63ce217d80ecdf
parente7ec24c9934c98a451e986a07651992df7fe6558
parent2ca329db2459a7f584444f3e50eebdecd78f7ab3
merge in master-release history after reset to master