am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1

* commit '32a035d165f43b72d961a71192c902eba581dd0e':
  docs: Android Design: v3 update (settings, navigation)