tree 6612a4783a0af5dacf89a520c8ea80420dc0103b
parent 9b5b1ad4161c68e1d059cb13f908a06e26614f8a
parent f278e6fdf767399834d5ef99bf9e8aa02ffe85b6
author Scott Main <smain@google.com> 1321570176 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321570176 -0800

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 and discussio

* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  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