merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 18 Sep 2013 04:11:35 +0000 (21:11 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 18 Sep 2013 04:11:35 +0000 (21:11 -0700)
commit5a4b627055bc6b044ffb59d38072ae6930bd2f0a
treeeec2f969a4f992be8d2296ec27192ebea24edf20
parent07bbe49f0f6fa58abf567c41ca99c39d110839f4
parent3e293661e1a2387862018af12e122315cd47878d
merge in klp-release history after reset to klp-dev