tree eb04cb34d8245f950a671d3ff854e2d991171201
parent 9c43e597d65f3b6256988ca5ca87128e13031946
parent f65b3dfbdc74eaa283462cfda963e5287f21c6f9
author Ed Heyl <edheyl@google.com> 1381971112 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381971112 -0700

am f65b3dfb: merge in klp-release (no-op)

* commit 'f65b3dfbdc74eaa283462cfda963e5287f21c6f9':