merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:02:11 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 16 Sep 2013 13:02:11 +0000 (06:02 -0700)
commitec24812c789dd09f7905cb1d4618baad216597e3
treecccb1c9eaab182b29f869b06a332541e161f844b
parentb148e621419b938daae0bee81c9b25341e1d297a
parentb33e5e05670cb0125ea603176418ad37c59493e9
merge in klp-release history after reset to klp-dev