OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 8 Apr 2014 12:49:14 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 8 Apr 2014 12:49:14 +0000 (05:49 -0700)
commit9a0bdf2bfa08279aa997a8f71aa2b5d3dd6743fb
tree32d2173aaffeea49df6229ab697e4ca6394baec1
parenteed8e1a2f607573c5768c0fdeb2c3ec133b1e8d1
parent335da6562c355d604ce2800b073d04f6c164008c
merge in master-release history after reset to master