merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 26 Sep 2013 13:01:29 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 26 Sep 2013 13:01:29 +0000 (06:01 -0700)
commitfa79534c04dfd11ccbd0daa4687fb0b470f22598
tree18db0ecd78c0f3a6d4100df8aa95b3dc8911cf79
parent21b2c1814fe47e88b3881d47983f79014682411e
parenta756bfb42e1f5658cd24076390a08307870f557c
merge in klp-release history after reset to klp-dev