am 504c5d9c: am a883fe8d: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
* commit '504c5d9c6e05cecabcb2404a2fd1a05259602858':


Trivial merge