tree f34c312625167b9d7d6fb6991f4c4e52b57a39bd
parent dbda791f3a77449b023fe0062895510e95da73dd
parent 85c7394836843b2cbfa2b51504448794a6071b3a
author Scott Main <smain@google.com> 1321570431 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321570431 -0800

am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code 

* commit '85c7394836843b2cbfa2b51504448794a6071b3a':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917