tree 38b38e6075d8ab87859fa37058a81709dced90f0
parent e2bdd6ae33640430fc4a0d58c263d5af94fdee77
parent 715139a620383c89e061a2b0650e184bf3382a10
author Ricardo Cervera <rcervera@google.com> 1396632540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396632540 +0000

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

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