OSDN Git Service

merge in master-release history after reset to 102a072d900d56c54ced6144666d35e373fe84b1
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:05 +0000 (07:22 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:05 +0000 (07:22 -0700)
commitcfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95
tree974fdf47c28e2c38c90d5e22bc44b0dc3f6f87f6
parent102a072d900d56c54ced6144666d35e373fe84b1
parent30fc16db37c654944df23d13ee36cd4656fef482
merge in master-release history after reset to 102a072d900d56c54ced6144666d35e373fe84b1