am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
automerge: 8e2dd14

* commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c':
  Special case AppCompat to show action bar.