tree 4762a1fb67c8ca4c46bdde4ef342b47206d8e42a
parent b7341e222d63da948153166523190c3eb5e1ca9c
parent 1ac6519b245c008ea6b3b6baba205fb58d75c807
author Ricardo Cervera <rcervera@google.com> 1396633588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396633588 +0000

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

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