OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 19 Apr 2014 12:50:21 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 19 Apr 2014 12:50:21 +0000 (05:50 -0700)
commit62cbda3ebd7023edd6f582724aae4ae8a8fe23ed
treee32b32d45e4fc2f7bdb802381dce4aa1f716333c
parent017a53851628e967e5e103a467acb602010dffdc
parentf1f2c35133df70327afa2513566a486399b68002
merge in master-release history after reset to master