tree 304222acda82d4bac43ac1c7e84600bc8d596d84
parent 04c6d73fd0e4472505275688ef8497bc6697647c
parent 83951615f564521d542da00d3bf60a372787aced
author Deepanshu Gupta <deepanshu@google.com> 1411700429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411700429 +0000

am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]