merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 12 Sep 2013 13:02:10 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 12 Sep 2013 13:02:10 +0000 (06:02 -0700)
commit10b9ac0a895dd4308796004cb3102dfa44acc710
treed947792a8d761d555cbba31156fffd568f8e3234
parent9c5ea82e4fd9f73ee4e450614ec7d89d97a4d399
parent8a86eaca9d82d8c2fe464fcda9fc033a5f598c7d
merge in klp-release history after reset to klp-dev