am 651db9b8: am 504c5d9c: am a883fe8d: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:17 +0000 (22:19 +0000)
* commit '651db9b8cc7d71e0c150e103cc97db900e226808':


Trivial merge