merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 10 Sep 2013 21:28:48 +0000 (14:28 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 10 Sep 2013 21:28:48 +0000 (14:28 -0700)
commit8cedfac5c97273244fd2c8e079a3dcf51eda76a0
tree56e71659667b75583f1190779b38511f1c4ebc83
parent09a7ac37a95dfe3f3099df8869f8347afcee0b9c
parenta07915f93f0d201d891f32fb556e59b255a8e65b
merge in klp-release history after reset to klp-dev