OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 1 Apr 2014 12:51:34 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 1 Apr 2014 12:51:34 +0000 (05:51 -0700)
commit43a37cf1adb2ef0d2296faaacf5bcf323bd08298
tree438ff1340bd9842f7f9e8aa591b317c38b4440d5
parent61ac531286b215bea5fdaab823bc83be086e7193
parent19570995906962ca2a13633b858a98cc959305b7
merge in master-release history after reset to master