merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Sun, 6 Oct 2013 13:02:14 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 6 Oct 2013 13:02:14 +0000 (06:02 -0700)
commit4721175b8ddf49d65bb7e5824688fcb856912479
treedacf4b675ec8f111b3187535076a27498acd81a4
parent9b6bb99520cd6252443b5c800f7f9f73ed272f54
parent05a4864b8273ae2ae7bb62a4f0a76c8c1e17f722
merge in klp-release history after reset to klp-dev