tree d94b16b608e1bc2984c091f822b533cea3820764
parent 43214e0c19c13acbf1ecd714167abf03283d54ef
parent f103317499bdb12cbcac1754899756d22acde986
author Deepanshu Gupta <deepanshu@google.com> 1411706453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411706453 +0000

am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

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