am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) 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 'ab5971d825d9d59f06b49e1f1e66a24df417124e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]