0495f1ef71
See https://code.google.com/p/android/issues/detail?id=74316 Updated keymap for new files and added note on choosing keymaps. Change-Id: I3c1e1a8ab0f344040ea2627734f7d5959c842799