OSDN Git Service

merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c
authorThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:51:31 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 30 Apr 2014 12:51:31 +0000 (05:51 -0700)
commit18a103d2681920986a5b2192ce9bf6d664f135b1
treee893de54b6f8ecc7dd8b25d539a3de59b1a20f79
parent4c2b869a3a30b257acce46d470e92e835a9eb82c
parent0b281c83683b25e2d74e161bf987687ed496fcec
merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c