merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 25 Sep 2013 13:01:49 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 25 Sep 2013 13:01:49 +0000 (06:01 -0700)
commita756bfb42e1f5658cd24076390a08307870f557c
tree3759501029b5bf35e3367fbaf85312af9c7f6dc2
parentd1b11a349bb6310fb7902280856daf09cac20647
parente3600ea1edbe9c9c1935bbb2afc47691a93a3374
merge in klp-release history after reset to klp-dev