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

* commit '8659a2d190acd1226ca8076681831963b169c963':