tree c974260ef89ae8d03056dace40fa43e91088604e
parent acf395fd9441bce9fbe68c1b7efbf824570284bc
parent 17878a9ab5c58f5b245bbdd0e8e16abbcde4a995
author quddusc <quddusc@google.com> 1396737532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396737532 +0000

am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs

* commit '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101