OSDN Git Service

merge in master-release history after reset to 9cba0f12682eadc0d297468fd547847c2f99e4b5
authorThe Android Automerger <android-build@google.com>
Sat, 26 Apr 2014 12:49:09 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 26 Apr 2014 12:49:09 +0000 (05:49 -0700)
commit290d300dca19886843335ebed1bd879438c1c4f0
tree3744a0461dde8ff926e8e782c5a3ea8b32984224
parent9cba0f12682eadc0d297468fd547847c2f99e4b5
parent93ecad77886a460ab9e6044fe562f5a5808193a9
merge in master-release history after reset to 9cba0f12682eadc0d297468fd547847c2f99e4b5