am 4d9c9bd5: merge in klp-release (no-op)

* commit '4d9c9bd5cc5f81954b1e9724d125b8947b412b04':
This commit is contained in:
Ed Heyl 2013-10-16 18:07:28 -07:00 committed by Android Git Automerger
commit a9266df577

Diff content is not available