tree aef239b6fa0f6ee3463afc5e443f10cf654179d3
parent ce4d5d367e4eb7819f09f30aef58dddbf5823ebd
parent 31fc69c218a6fb46c43a650cc0530e12853066bb
author Roman Nurik <romannurik@google.com> 1333576595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333576595 -0700

am 31fc69c2: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1

* commit '31fc69c218a6fb46c43a650cc0530e12853066bb':