am 6573f1c7: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Thu, 17 Oct 2013 01:02:04 +0000 (18:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 01:02:04 +0000 (18:02 -0700)
commit116be5379a44fd6bf26adf15f7e3bf1c39cbf30e
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent74691939efdd6287721a93a95479f4d7cb708dbe
parent6573f1c77f56648a40b00ebe323eadafd7cc5157
am 6573f1c7: merge in klp-release (no-op)

* commit '6573f1c77f56648a40b00ebe323eadafd7cc5157':