tree 26fdfe7f82855964dab7a92c0d57aba8bcf449b5
parent 9657139ca0bbea9a84e0a3c7e9438d1f53c9ed24
parent ac427985df589ec36369ed2ae9d266d83f420e5c
author Ed Heyl <edheyl@google.com> 1381971719 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381971719 -0700

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

* commit 'ac427985df589ec36369ed2ae9d266d83f420e5c':