am 536dea9d: am 169c12b5: merge in klp-release (no-op)

* commit '536dea9d61a032e64bbe584a97463c6638ead009':
This commit is contained in:
Ed Heyl 2013-10-16 18:13:01 -07:00 committed by Android Git Automerger
commit 8d16ac26f3

Diff content is not available