tree 304222acda82d4bac43ac1c7e84600bc8d596d84
parent 416b74fe31124d21f14bb5900f4872cdf62f08e0
parent 8c61344d89ab3b1f02228b3da10c8377c41960ff
author Deepanshu Gupta <deepanshu@google.com> 1411711503 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411711503 +0000

am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

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