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)
commit651db9b8cc7d71e0c150e103cc97db900e226808
tree3ad58971581c1f9a1026c8e163ca90737bc306d5
parent61a44ef24f5f0a1b102a613931d10125f04eeb91
parent504c5d9c6e05cecabcb2404a2fd1a05259602858
am 504c5d9c: am a883fe8d: merge in klp-release (no-op)

* commit '504c5d9c6e05cecabcb2404a2fd1a05259602858':