merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 1 Oct 2013 13:01:34 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 1 Oct 2013 13:01:34 +0000 (06:01 -0700)
commit47f6386b7fa9d8c8fbd2725e6e009e6d2dddc9d4
tree37669c24ea0bfb85bdc9a297f66826994bb5395c
parente4dc524e195b2dd8d86dd80504500f8f5bb11d92
parentb5b9d5357438c8aaa2b941169855821bcc62e1d9
merge in klp-release history after reset to klp-dev