am 504c5d9c: am a883fe8d: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Thu, 17 Oct 2013 01:01:56 +0000 (18:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 01:01:56 +0000 (18:01 -0700)
commitb9d649ece1f30075ca79bccdab5e146646793eea
tree2047214672ea02b96a752496d24488fbdc343614
parent2b0e88cd6ff04d1087d9dde6f35d7103c986f97d
parent504c5d9c6e05cecabcb2404a2fd1a05259602858
am 504c5d9c: am a883fe8d: merge in klp-release (no-op)

* commit '504c5d9c6e05cecabcb2404a2fd1a05259602858':