OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 9 Apr 2014 12:49:18 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 9 Apr 2014 12:49:18 +0000 (05:49 -0700)
commit210d65e900ae2af5bce657afe6ce45f797861660
treef0c23e20a91e00ea216450f81821d6ef02b36ca6
parent38568b424d3139c6d590f9b3d7961e16b8795dc2
parent8c2a769395995e447a4769a492abaefa3f2985fc
merge in master-release history after reset to master