tree 52f180a28c1d8be0ca5c642ba79a1dfe38bb201d
parent 2cda66116cd0f0c879d5543182379e2c93049d34
parent be662187aa579970cda4af49affd31958efc137c
author Ed Heyl <edheyl@google.com> 1381970871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381970871 -0700

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

* commit 'be662187aa579970cda4af49affd31958efc137c':