merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:01:32 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:01:32 +0000 (06:01 -0700)
commit3e293661e1a2387862018af12e122315cd47878d
treea5a42f230d6d30a999943f7bfb1fc0923f15e03f
parent461c790adc346474a2e2db833ebaf9827f5f6837
parent8cedfac5c97273244fd2c8e079a3dcf51eda76a0
merge in klp-release history after reset to klp-dev