OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 17 Apr 2014 12:50:25 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 17 Apr 2014 12:50:25 +0000 (05:50 -0700)
commit99f3adfa113088a3eff9f865141ee1ee168145f5
tree65bb3c48fafe6874f0805de2278b93408a8e8c87
parent03ae0fdc6d7ace473bbf2da7982d2e062b087187
parent91abffb4a2ea488e0e5605fa0efd1df6d25a0393
merge in master-release history after reset to master