tree 2446fed4ef77b30039f18d7df9eae8d86a06fc1e
parent fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331
parent 3966c571a0c36a40a8142e70b1aa6de547ea6ec3
author Ed Heyl <edheyl@google.com> 1381970652 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381970652 -0700

am 3966c571: merge in klp-release (no-op)

* commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':