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)
commit504c5d9c6e05cecabcb2404a2fd1a05259602858
tree3ad58971581c1f9a1026c8e163ca90737bc306d5
parentad73045fa524976ad55b95edc89b46c37ef08273
parenta883fe8d91dbcf3bde791e5810338fcb4ee8aca5
am a883fe8d: merge in klp-release (no-op)

* commit 'a883fe8d91dbcf3bde791e5810338fcb4ee8aca5':