tree 52e60dcc52e47b7ac63f301a1b7977fcf4f5f276
parent bff6a514da978644f1cdf6e5bdd6f93353b74572
parent fa840e2b9f7e8b5655fa262cd063800188dec216
author Roman Nurik <romannurik@google.com> 1333562149 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333562149 -0700

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

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