tree 7290bfd2dc6d80fbfabd8409b95bfb73c2901e30
parent c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd
parent a39b3b25b947d6c1ab49c08fdcd6f5149f037b20
author Deepanshu Gupta <deepanshu@google.com> 1411697262 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411697262 +0000

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

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