tree bfa4df2f730f1269b5ff6d6b86b14e93a45ee23b
parent c6d4a4647074e7d9f4882e54637567103108c0e3
parent c31bd52df22dabf52b50e1377878548607d1f07b
author Ricardo Cervera <rcervera@google.com> 1396633179 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396633179 +0000

am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs

* commit 'c31bd52df22dabf52b50e1377878548607d1f07b':
  docs: Fixed action bar example. Bug: 13806963