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

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