am a883fe8d: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Thu, 17 Oct 2013 00:56:27 +0000 (17:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 00:56:27 +0000 (17:56 -0700)
* commit 'a883fe8d91dbcf3bde791e5810338fcb4ee8aca5':


Trivial merge