tree b1d2b2deae549de57f1a9de87dadbc8aeea52404
parent ea48c442be3d5130cfc6ae4198858b1895ebc415
parent d6a3e485b58e23808b44b8f2374e67e891cfae05
author Dianne Hackborn <hackbod@google.com> 1362091143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362091143 +0000

am d6a3e485: Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev

* commit 'd6a3e485b58e23808b44b8f2374e67e891cfae05':
  Unify normal and overlay action bar layouts.