merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 16 Oct 2013 04:14:10 +0000 (21:14 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 16 Oct 2013 04:14:10 +0000 (21:14 -0700)
commitdd9bd1bb24ef4b81812956051179e8e274bee0db
tree4085b5037c0e4b9c9916a432a501929f2e000aa2
parente3f6e6a186ac6efe15faa0aa9f1df0333e114ed7
parent640cb7e91fce37e910da8e46a83bbeaf5738abcc
merge in klp-release history after reset to klp-dev