OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 10 Apr 2014 12:49:19 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 10 Apr 2014 12:49:19 +0000 (05:49 -0700)
commit43132ace88269eb6879d2836f2ccc9fecc24b09f
tree9812b003c54a15f86bf0a1068d87739f40184d6f
parent26e1a28e7f9aa22b37ec7d98dab0de5c93202ab0
parent4d4f278583c2b1c5c1112200b4cc1352ce15881e
merge in master-release history after reset to master