merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 26 Aug 2013 13:01:41 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 26 Aug 2013 13:01:41 +0000 (06:01 -0700)
commitdf76219fdac9f1114c46382b348281222add2394
tree1a86d720d631b874083f2d669c45197d46a8b625
parentfd07263f824134d4bce91a3e1d51c851894bf758
parentc628575e8a7bbc23f4f80380984407b11762d2ba
merge in klp-release history after reset to klp-dev