merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:02:29 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:02:29 +0000 (06:02 -0700)
commitb0ea1dd57c4fbb51293b728ef738bd6065c2a935
tree7209449cecff434c66a5df3a4a6479c1e0686da8
parente00d56d349fff8a9c5dc86739448603986ba6cb5
parent10b9ac0a895dd4308796004cb3102dfa44acc710
merge in klp-release history after reset to klp-dev