tree 3d221da7ce4fcd75ad1c84ddc4e360c3f02df67a
parent 13d49e9f364965169f933bcad6bcaeeb2f29fade
parent a821af684e2a5f814fc8709518b5f0589c81661e
author Ricardo Cervera <rcervera@google.com> 1396632762 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396632762 +0000

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

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