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

* commit '7dc67f51272de42112d51a912c352ff2dc3aaf9c':