tree 1b85c665e4316f4bb60b3ba9eaa0fd249cf10694
parent 9f6bfa302a4744271966d102d2f791127fdc7111
parent a370c0f7fe65d6f012902342249d3a84b474f277
author Ed Heyl <edheyl@google.com> 1381970954 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381970954 -0700

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

* commit 'a370c0f7fe65d6f012902342249d3a84b474f277':