am 85e0eb4a: merge in klp-release (no-op)

* commit '85e0eb4a7db41aafe1126ee00c49293abfb7ea12':
This commit is contained in:
Ed Heyl 2013-10-16 17:49:08 -07:00 committed by Android Git Automerger
commit 7852ad1ca7

Diff content is not available