am b3091c5f: am c612a981: Merge "Rename key_space"

* commit 'b3091c5f388359f3c614534f87f98e5181f13a6f':
main
Satoshi Kataoka 2013-09-26 06:04:22 -07:00 committed by Android Git Automerger
commit 87a6753898

Diff Content Not Available