OSDN Git Service

merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c
authorThe Android Automerger <android-build@google.com>
Tue, 29 Apr 2014 12:51:18 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 29 Apr 2014 12:51:18 +0000 (05:51 -0700)
commit0b281c83683b25e2d74e161bf987687ed496fcec
treee893de54b6f8ecc7dd8b25d539a3de59b1a20f79
parent4c2b869a3a30b257acce46d470e92e835a9eb82c
parent97a32f83b1abdcfe371b81bfbbb2a049a9bc4d94
merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c