merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 19 Sep 2013 13:02:22 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 19 Sep 2013 13:02:22 +0000 (06:02 -0700)
commit1373031fac29b1d32c9cc5e6403e386f2231caf0
tree1652bb0c244513e65612d934c8dc0c1921aa09bf
parent8ec87ea5a5c191554d6205d4c779768664b1724b
parentb0ea1dd57c4fbb51293b728ef738bd6065c2a935
merge in klp-release history after reset to klp-dev