tree 646037b381230120ce23d87cf4ec145e1a12c4fc
parent cbf42ecef2343b85cbe8c33125369f0fbeeb77b1
parent b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e
author Scott Main <smain@google.com> 1277937362 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277937362 -0700

am b2d1a71b: am 92dbad8a: am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.

Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'

* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
  docs: revise menu guide to focus more on using menu resources